Merge branch 'release-candidate' into shiba-dev

Sankore 3.1.iss

@@ -83,13 +83,13 @@ Source: "..\Qt-4.8\plugins\phonon_backend\phonon_ds94.dll"; DestDir: "{app}\phon
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 ;qt multimedia plugins
-Source: "c:\OpenSankore\plugins\mediaservice\dsengine.dll"; DestDir: "c:\OpenSankore\mediaservice"; Flags: ignoreversion
-Source: "c:\OpenSankore\plugins\mediaservice\dsengined.dll"; DestDir: "c:\OpenSankore\mediaservice"; Flags: ignoreversion
-Source: "c:\OpenSankore\plugins\mediaservice\qtmedia_audioengine.dll"; DestDir: "c:\OpenSankore\mediaservice"; Flags: ignoreversion
-Source: "c:\OpenSankore\plugins\mediaservice\qtmedia_audioengined.dll"; DestDir: "c:\OpenSankore\mediaservice"; Flags: ignoreversion
+Source: "c:\OpenSankore\plugins\mediaservice\dsengine.dll"; DestDir: "c:\OpenSankore\plugins\mediaservice"; Flags: ignoreversion
+Source: "c:\OpenSankore\plugins\mediaservice\dsengined.dll"; DestDir: "c:\OpenSankore\plugins\mediaservice"; Flags: ignoreversion
+Source: "c:\OpenSankore\plugins\mediaservice\qtmedia_audioengine.dll"; DestDir: "c:\OpenSankore\plugins\mediaservice"; Flags: ignoreversion
+Source: "c:\OpenSankore\plugins\mediaservice\qtmedia_audioengined.dll"; DestDir: "c:\OpenSankore\plugins\mediaservice"; Flags: ignoreversion
 
-Source: "c:\OpenSankore\plugins\playlistformats\qtmultimediakit_m3u.dll"; DestDir: "c:\OpenSankore\playlistformats"; Flags: ignoreversion
-Source: "c:\OpenSankore\plugins\playlistformats\qtmultimediakit_m3ud.dll"; DestDir: "c:\OpenSankore\playlistformats"; Flags: ignoreversion
+Source: "c:\OpenSankore\plugins\playlistformats\qtmultimediakit_m3u.dll"; DestDir: "c:\OpenSankore\plugins\playlistformats"; Flags: ignoreversion
+Source: "c:\OpenSankore\plugins\playlistformats\qtmultimediakit_m3ud.dll"; DestDir: "c:\OpenSankore\plugins\playlistformats"; Flags: ignoreversion
 
 [Icons]
 Name: "{group}\Open-Sankoré"; Filename: "{app}\Open-Sankore.exe"

Sankore_3.1.pro

@@ -11,7 +11,7 @@ CONFIG += debug_and_release \
 VERSION_MAJ = 2
 VERSION_MIN = 00 
 VERSION_TYPE = b # a = alpha, b = beta, r = release, other => error
-VERSION_PATCH = 09
+VERSION_PATCH = 10 
 
 VERSION = "$${VERSION_MAJ}.$${VERSION_MIN}.$${VERSION_TYPE}.$${VERSION_PATCH}"
 VERSION = $$replace(VERSION, "\\.r", "")

resources/forms/preferences.ui

@@ -24,7 +24,7 @@
    <item row="1" column="0">
     <widget class="QTabWidget" name="mainTabWidget">
      <property name="currentIndex">
-      <number>3</number>
+      <number>0</number>
      </property>
      <widget class="QWidget" name="displayTab">
       <attribute name="title">
@@ -608,19 +608,6 @@
          </layout>
         </widget>
        </item>
-       <item row="3" column="0">
-        <spacer name="verticalSpacer_2">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>40</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
        <item row="2" column="0">
         <widget class="QGroupBox" name="CommunityGroupBox">
          <property name="sizePolicy">
@@ -630,7 +617,7 @@
           </sizepolicy>
          </property>
          <property name="title">
-          <string>Planète Sankoré ID</string>
+          <string>Planète Sankoré ID for exporting file</string>
          </property>
          <layout class="QGridLayout" name="gridLayout_18">
           <item row="2" column="1">
@@ -693,9 +680,38 @@
             </property>
            </spacer>
           </item>
+          <item row="3" column="1">
+           <widget class="QCheckBox" name="PSCredentialsPersistenceCheckBox">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="text">
+             <string>Restore credentials on reboot  </string>
+            </property>
+            <property name="checked">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
          </layout>
         </widget>
        </item>
+       <item row="3" column="0">
+        <spacer name="verticalSpacer_2">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="thirdPartyLicence">
@@ -736,11 +752,11 @@
           <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Lucida Grande'; font-size:13pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Ubuntu'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;table border=&quot;0&quot; style=&quot;-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;&quot;&gt;
 &lt;tr&gt;
 &lt;td style=&quot;border: none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:11pt;&quot;&gt;The licences are in English to respect the official and legal approved translation.&lt;/span&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/body&gt;&lt;/html&gt;</string>
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:11pt;&quot;&gt;The licences are in English to respect the official and legal approved translation.&lt;/span&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/body&gt;&lt;/html&gt;</string>
          </property>
          <property name="textInteractionFlags">
           <set>Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
@@ -772,12 +788,12 @@ p, li { white-space: pre-wrap; }
               <string notr="true">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Lucida Grande'; font-size:13pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Ubuntu'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;table border=&quot;0&quot; style=&quot;-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;&quot;&gt;
 &lt;tr&gt;
 &lt;td style=&quot;border: none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:9pt; color:#1a1a1a;&quot;&gt;The OpenSSL toolkit stays under a dual license, i.e. both the conditions of the OpenSSL License and the original SSLeay license apply to the toolkit.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:9pt; color:#1a1a1a;&quot;&gt;See below for the actual license texts. Actually both licenses are BSD-style Open Source licenses. In case of any license issues related to OpenSSL please contact &lt;/span&gt;&lt;a href=&quot;mailto:openssl-core@openssl.org&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:9pt; text-decoration: underline; color:#0000ff;&quot;&gt;openssl-core@openssl.org&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:9pt; color:#1a1a1a;&quot;&gt;.&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:9pt;&quot;&gt; &lt;/span&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/body&gt;&lt;/html&gt;</string>
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:9pt; color:#1a1a1a;&quot;&gt;The OpenSSL toolkit stays under a dual license, i.e. both the conditions of the OpenSSL License and the original SSLeay license apply to the toolkit.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:9pt; color:#1a1a1a;&quot;&gt;See below for the actual license texts. Actually both licenses are BSD-style Open Source licenses. In case of any license issues related to OpenSSL please contact &lt;/span&gt;&lt;a href=&quot;mailto:openssl-core@openssl.org&quot;&gt;&lt;span style=&quot; font-size:9pt; text-decoration: underline; color:#0000ff;&quot;&gt;openssl-core@openssl.org&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; font-size:9pt; color:#1a1a1a;&quot;&gt;.&lt;/span&gt;&lt;span style=&quot; font-size:9pt;&quot;&gt; &lt;/span&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/body&gt;&lt;/html&gt;</string>
              </property>
             </widget>
            </item>
@@ -794,11 +810,11 @@ p, li { white-space: pre-wrap; }
               <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Lucida Grande'; font-size:13pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Ubuntu'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;table border=&quot;0&quot; style=&quot;-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;&quot;&gt;
 &lt;tr&gt;
 &lt;td style=&quot;border: none;&quot;&gt;
-&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:9pt; color:#1a1a1a;&quot;&gt;Copyright (C) 1995-1998 Jean-loup Gailly and Mark Adler&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;br /&gt;&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:9pt; color:#1a1a1a;&quot;&gt;  This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:9pt;&quot;&gt;&lt;br /&gt;&lt;br /&gt;&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:9pt; color:#1a1a1a;&quot;&gt;  Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions:&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:9pt;&quot;&gt;&lt;br /&gt;&lt;br /&gt;&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:9pt; color:#1a1a1a;&quot;&gt;  1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:9pt;&quot;&gt;&lt;br /&gt;&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:9pt; color:#1a1a1a;&quot;&gt;  2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:9pt;&quot;&gt;&lt;br /&gt;&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:9pt; color:#1a1a1a;&quot;&gt;  3. This notice may not be removed or altered from any source distribution.&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:9pt;&quot;&gt; &lt;/span&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/body&gt;&lt;/html&gt;</string>
+&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:9pt; color:#1a1a1a;&quot;&gt;Copyright (C) 1995-1998 Jean-loup Gailly and Mark Adler&lt;/span&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;br /&gt;&lt;/span&gt;&lt;span style=&quot; font-size:9pt; color:#1a1a1a;&quot;&gt;  This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.&lt;/span&gt;&lt;span style=&quot; font-size:9pt;&quot;&gt;&lt;br /&gt;&lt;br /&gt;&lt;/span&gt;&lt;span style=&quot; font-size:9pt; color:#1a1a1a;&quot;&gt;  Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions:&lt;/span&gt;&lt;span style=&quot; font-size:9pt;&quot;&gt;&lt;br /&gt;&lt;br /&gt;&lt;/span&gt;&lt;span style=&quot; font-size:9pt; color:#1a1a1a;&quot;&gt;  1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.&lt;/span&gt;&lt;span style=&quot; font-size:9pt;&quot;&gt;&lt;br /&gt;&lt;/span&gt;&lt;span style=&quot; font-size:9pt; color:#1a1a1a;&quot;&gt;  2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.&lt;/span&gt;&lt;span style=&quot; font-size:9pt;&quot;&gt;&lt;br /&gt;&lt;/span&gt;&lt;span style=&quot; font-size:9pt; color:#1a1a1a;&quot;&gt;  3. This notice may not be removed or altered from any source distribution.&lt;/span&gt;&lt;span style=&quot; font-size:9pt;&quot;&gt; &lt;/span&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/body&gt;&lt;/html&gt;</string>
              </property>
             </widget>
            </item>
@@ -815,11 +831,11 @@ p, li { white-space: pre-wrap; }
               <string notr="true">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Lucida Grande'; font-size:13pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Ubuntu'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;table border=&quot;0&quot; style=&quot;-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;&quot;&gt;
 &lt;tr&gt;
 &lt;td style=&quot;border: none;&quot;&gt;
-&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:9pt; color:#000000;&quot;&gt;Xpdf is licensed under the GNU General Public License (GPL), version 2.&lt;/span&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/body&gt;&lt;/html&gt;</string>
+&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:9pt; color:#000000;&quot;&gt;Xpdf is licensed under the GNU General Public License (GPL), version 2.&lt;/span&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/body&gt;&lt;/html&gt;</string>
              </property>
             </widget>
            </item>
@@ -836,11 +852,11 @@ p, li { white-space: pre-wrap; }
               <string notr="true">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Lucida Grande'; font-size:13pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Ubuntu'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;table border=&quot;0&quot; style=&quot;-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;&quot;&gt;
 &lt;tr&gt;
 &lt;td style=&quot;border: none;&quot;&gt;
-&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:9pt;&quot;&gt;GNU Library or Lesser General Public License (LGPL), zlib/libpng License&lt;/span&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/body&gt;&lt;/html&gt;</string>
+&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:9pt;&quot;&gt;GNU Library or Lesser General Public License (LGPL), zlib/libpng License&lt;/span&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/body&gt;&lt;/html&gt;</string>
              </property>
             </widget>
            </item>
@@ -1321,12 +1337,12 @@ DAMAGES.
           <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Lucida Grande'; font-size:13pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Ubuntu'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;table border=&quot;0&quot; style=&quot;-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;&quot;&gt;
 &lt;tr&gt;
 &lt;td style=&quot;border: none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:11pt;&quot;&gt;Open-Sankoré version 1.4 , Copyright (C) 2010-2012 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA)&lt;br /&gt;&lt;br /&gt;Open-Sankoré est un logiciel libre : vous pouvez le redistribuer et/ou le modifier en respectant les termes de la Lesser GNU general Public Licence (GNU LGPL) telle que publiée par la Free Software Foundation en version 2 ou une version plus récente.&lt;br /&gt;Vous pouvez consulter et charger le code source du logiciel sur &lt;/span&gt;&lt;a href=&quot;https://github.com/Sankore&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:11pt; text-decoration: underline; color:#0000ff;&quot;&gt;&amp;lt;https://github.com/Sankore&amp;gt;&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:11pt;&quot;&gt;&lt;br /&gt;Open-Sankoré est distribué dans l'espoir qu'il sera utile, mais SANS AUCUNE GARANTIE, sans même la garantie implicite de COMMERCIALISATION ou D'ADAPTATION A UN OBJET PARTICULIER.&lt;br /&gt;Veuillez consulter la licence Lesser GNU General Public Licence située dans l'onglet Licences ou consulter le site &lt;/span&gt;&lt;a href=&quot;http://www.gnu.org/licenses/&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:11pt; text-decoration: underline; color:#0000ff;&quot;&gt;&amp;lt;http://www.gnu.org/licenses/&amp;gt;&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:11pt;&quot;&gt;.&lt;br /&gt;&lt;br /&gt;Open-Sankoré is free software: you can redistribute it and/or modify it under the terms of the Lesser GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or any later version. You can find the source code of this software at &lt;/span&gt;&lt;a href=&quot;https://github.com/Sankore&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:11pt; text-decoration: underline; color:#0000ff;&quot;&gt;&amp;lt;https://github.com/Sankore&amp;gt;&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:11pt;&quot;&gt;&lt;br /&gt;Open-Sankoré is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Lesser GNU General Public License below for more details.&lt;br /&gt;&lt;br /&gt;&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:11pt;&quot;&gt;Contact : &lt;br /&gt;Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA)&lt;br /&gt;Délégation Interministérielle à l'Education Numérique en Afrique&lt;br /&gt;20 Avenue Ségur Paris 75007&lt;br /&gt;Téléphone : 01 43 17 68 08&lt;br /&gt;email: &lt;/span&gt;&lt;a href=&quot;mailto:contact@sankore.org&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:11pt; text-decoration: underline; color:#0000ff;&quot;&gt;contact@sankore.org&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:11pt;&quot;&gt;&amp;quot;&lt;/span&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/body&gt;&lt;/html&gt;</string>
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:11pt;&quot;&gt;Open-Sankoré version 1.4 , Copyright (C) 2010-2012 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA)&lt;br /&gt;&lt;br /&gt;Open-Sankoré est un logiciel libre : vous pouvez le redistribuer et/ou le modifier en respectant les termes de la Lesser GNU general Public Licence (GNU LGPL) telle que publiée par la Free Software Foundation en version 2 ou une version plus récente.&lt;br /&gt;Vous pouvez consulter et charger le code source du logiciel sur &lt;/span&gt;&lt;a href=&quot;https://github.com/Sankore&quot;&gt;&lt;span style=&quot; font-size:11pt; text-decoration: underline; color:#0000ff;&quot;&gt;&amp;lt;https://github.com/Sankore&amp;gt;&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; font-size:11pt;&quot;&gt;&lt;br /&gt;Open-Sankoré est distribué dans l'espoir qu'il sera utile, mais SANS AUCUNE GARANTIE, sans même la garantie implicite de COMMERCIALISATION ou D'ADAPTATION A UN OBJET PARTICULIER.&lt;br /&gt;Veuillez consulter la licence Lesser GNU General Public Licence située dans l'onglet Licences ou consulter le site &lt;/span&gt;&lt;a href=&quot;http://www.gnu.org/licenses/&quot;&gt;&lt;span style=&quot; font-size:11pt; text-decoration: underline; color:#0000ff;&quot;&gt;&amp;lt;http://www.gnu.org/licenses/&amp;gt;&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; font-size:11pt;&quot;&gt;.&lt;br /&gt;&lt;br /&gt;Open-Sankoré is free software: you can redistribute it and/or modify it under the terms of the Lesser GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or any later version. You can find the source code of this software at &lt;/span&gt;&lt;a href=&quot;https://github.com/Sankore&quot;&gt;&lt;span style=&quot; font-size:11pt; text-decoration: underline; color:#0000ff;&quot;&gt;&amp;lt;https://github.com/Sankore&amp;gt;&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; font-size:11pt;&quot;&gt;&lt;br /&gt;Open-Sankoré is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Lesser GNU General Public License below for more details.&lt;br /&gt;&lt;br /&gt;&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:11pt;&quot;&gt;Contact : &lt;br /&gt;Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA)&lt;br /&gt;Délégation Interministérielle à l'Education Numérique en Afrique&lt;br /&gt;20 Avenue Ségur Paris 75007&lt;br /&gt;Téléphone : 01 43 17 68 08&lt;br /&gt;email: &lt;/span&gt;&lt;a href=&quot;mailto:contact@sankore.org&quot;&gt;&lt;span style=&quot; font-size:11pt; text-decoration: underline; color:#0000ff;&quot;&gt;contact@sankore.org&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; font-size:11pt;&quot;&gt;&amp;quot;&lt;/span&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/body&gt;&lt;/html&gt;</string>
          </property>
         </widget>
        </item>
@@ -1355,7 +1371,7 @@ p, li { white-space: pre-wrap; }
            <rect>
             <x>10</x>
             <y>30</y>
-            <width>341</width>
+            <width>551</width>
             <height>21</height>
            </rect>
           </property>
@@ -1381,52 +1397,52 @@ p, li { white-space: pre-wrap; }
           <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Lucida Grande'; font-size:13pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:10pt;&quot;&gt;Crédits police scolaire Open-Sankoré : &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Ubuntu'; font-size:10pt;&quot;&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:10pt;&quot;&gt;&lt;br /&gt;&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:10pt;&quot;&gt;La police Andika Basic dispose d'une licence Open Font License &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:10pt;&quot;&gt; © Sil international&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:10pt;&quot;&gt;Source http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&amp;amp;id=andika&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Ubuntu'; font-size:10pt;&quot;&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:10pt;&quot;&gt;&lt;br /&gt;&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:10pt;&quot;&gt;Licence OFL (traduction française non officielle) http://fontforge.sourceforge.net/OFL-Unofficial-fr.html&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Ubuntu'; font-size:10pt;&quot;&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:10pt;&quot;&gt;&lt;br /&gt;&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:10pt;&quot;&gt;Les polices Ecolier suivantes sont l'oeuvre de Jean-Marie Douteau et disposent d'une licence OFL : &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:10pt;&quot;&gt;- Ecolier Court &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:10pt;&quot;&gt;- Ecolier Ligne Court&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:10pt;&quot;&gt; © Jean-Marie Douteau (douteau.ecolier@sfr.fr)&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:10pt;&quot;&gt;Source : http://douteau.ecolier.perso.sfr.fr/page_ecolier.htm&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Ubuntu'; font-size:10pt;&quot;&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:10pt;&quot;&gt;&lt;br /&gt;&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:10pt;&quot;&gt;Les polices Ecolier suivantes sont l'oeuvre de Jean-Marie Douteau et disposent d'une licence Creative Commons BY NC ND :&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:10pt;&quot;&gt;- Ecolier lignes pointillés&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:10pt;&quot;&gt;- Écolier pointillés&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:10pt;&quot;&gt;- Écolier CP&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:10pt;&quot;&gt;- Écolier CP pointillés&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:10pt;&quot;&gt; © Jean-Marie Douteau (douteau.ecolier@sfr.fr)&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:10pt;&quot;&gt;Source : http://douteau.ecolier.perso.sfr.fr/page_ecolier.htm&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Ubuntu'; font-size:10pt;&quot;&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:10pt;&quot;&gt;&lt;br /&gt;&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:10pt;&quot;&gt;Les polices Cursive sont l'oeuvre d'Antoine Fetet (antoine.fetet@laposte.net) à partir d'une police proposée par Jean-Claude Gineau&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:10pt;&quot;&gt;Source : http://lps13.free.fr/contenu/construire/Cursive_standard.zip et http://fr.fontriver.com/font/gino_school_script/&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:10pt;&quot;&gt;L'auteur en autorise l'utilisation dans le cadre du logiciel open-Sankoré pour un usage non commercial&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Ubuntu'; font-size:10pt;&quot;&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:10pt;&quot;&gt;&lt;br /&gt;&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:10pt;&quot;&gt;Les polices Script (Ecole et CaseEcole) sont l'oeuvre d'Henri Rogelet&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:10pt;&quot;&gt;Source : http://pointecole.free.fr/polices/SCRIPTCO.zip&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:10pt;&quot;&gt;Source : http://pointecole.free.fr/polices/SCRIPTCA.zip&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:10pt;&quot;&gt; © Henri Rogelet &amp;lt;h.rogelet@free.fr&amp;gt;&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:10pt;&quot;&gt;Autorisation pour un usage non commercial&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:10pt;&quot;&gt;Source : http://pointecole.free.fr/polices.html&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Ubuntu'; font-size:10pt;&quot;&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:10pt;&quot;&gt;&lt;br /&gt;&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:10pt;&quot;&gt;La police phonétique, Alphonet est l'oeuvre d'Henri Rogelet&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:10pt;&quot;&gt;Source : http://pointecole.free.fr/polices/ALPHONET.zip&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:10pt;&quot;&gt; © Henri Rogelet &amp;lt;h.rogelet@free.fr&amp;gt;&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:10pt;&quot;&gt;Autorisation pour un usage non commercial&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:10pt;&quot;&gt;Source : http://pointecole.free.fr/polices.html&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Ubuntu'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Crédits police scolaire Open-Sankoré : &lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;La police Andika Basic dispose d'une licence Open Font License &lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt; © Sil international&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Source http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&amp;amp;id=andika&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Licence OFL (traduction française non officielle) http://fontforge.sourceforge.net/OFL-Unofficial-fr.html&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Les polices Ecolier suivantes sont l'oeuvre de Jean-Marie Douteau et disposent d'une licence OFL : &lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;- Ecolier Court &lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;- Ecolier Ligne Court&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt; © Jean-Marie Douteau (douteau.ecolier@sfr.fr)&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Source : http://douteau.ecolier.perso.sfr.fr/page_ecolier.htm&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Les polices Ecolier suivantes sont l'oeuvre de Jean-Marie Douteau et disposent d'une licence Creative Commons BY NC ND :&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;- Ecolier lignes pointillés&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;- Écolier pointillés&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;- Écolier CP&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;- Écolier CP pointillés&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt; © Jean-Marie Douteau (douteau.ecolier@sfr.fr)&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Source : http://douteau.ecolier.perso.sfr.fr/page_ecolier.htm&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Les polices Cursive sont l'oeuvre d'Antoine Fetet (antoine.fetet@laposte.net) à partir d'une police proposée par Jean-Claude Gineau&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Source : http://lps13.free.fr/contenu/construire/Cursive_standard.zip et http://fr.fontriver.com/font/gino_school_script/&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;L'auteur en autorise l'utilisation dans le cadre du logiciel open-Sankoré pour un usage non commercial&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Les polices Script (Ecole et CaseEcole) sont l'oeuvre d'Henri Rogelet&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Source : http://pointecole.free.fr/polices/SCRIPTCO.zip&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Source : http://pointecole.free.fr/polices/SCRIPTCA.zip&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt; © Henri Rogelet &amp;lt;h.rogelet@free.fr&amp;gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Autorisation pour un usage non commercial&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Source : http://pointecole.free.fr/polices.html&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;La police phonétique, Alphonet est l'oeuvre d'Henri Rogelet&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Source : http://pointecole.free.fr/polices/ALPHONET.zip&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt; © Henri Rogelet &amp;lt;h.rogelet@free.fr&amp;gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Autorisation pour un usage non commercial&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Source : http://pointecole.free.fr/polices.html&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
          </property>
          <property name="textInteractionFlags">
           <set>Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>

resources/forms/youTubePublishingDialog.ui

@@ -123,7 +123,7 @@
        </property>
       </widget>
      </item>
-     <item row="9" column="1">
+     <item row="10" column="1">
       <widget class="QLabel" name="label_4">
        <property name="text">
         <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
@@ -143,13 +143,23 @@ p, li { white-space: pre-wrap; }
        </property>
       </widget>
      </item>
-     <item row="10" column="1">
+     <item row="11" column="1">
       <widget class="QDialogButtonBox" name="dialogButtons">
        <property name="standardButtons">
         <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
        </property>
       </widget>
      </item>
+     <item row="9" column="1">
+      <widget class="QCheckBox" name="youtubeCredentialsPersistence">
+       <property name="text">
+        <string>Restore credentials on reboot</string>
+       </property>
+       <property name="checked">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
     </layout>
    </item>
   </layout>

resources/i18n/sankore_ar.ts

@@ -1586,10 +1586,6 @@
 </context>
 <context>
     <name>UBGraphicsWidgetItem</name>
-    <message>
-        <source>Cannot load content</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Loading ...</source>
         <translation type="unfinished">تحميل...</translation>

resources/i18n/sankore_bg.ts

@@ -1578,10 +1578,6 @@
 </context>
 <context>
     <name>UBGraphicsWidgetItem</name>
-    <message>
-        <source>Cannot load content</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Loading ...</source>
         <translation type="unfinished">Зареждане...</translation>

resources/i18n/sankore_ca.ts

@@ -1579,10 +1579,6 @@
 </context>
 <context>
     <name>UBGraphicsWidgetItem</name>
-    <message>
-        <source>Cannot load content</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Loading ...</source>
         <translation type="unfinished">S&apos;està carregant...</translation>

resources/i18n/sankore_cs.ts

@@ -1581,10 +1581,6 @@
 </context>
 <context>
     <name>UBGraphicsWidgetItem</name>
-    <message>
-        <source>Cannot load content</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Loading ...</source>
         <translation type="unfinished">Nahrává se...</translation>

resources/i18n/sankore_da.ts

@@ -1577,10 +1577,6 @@
 </context>
 <context>
     <name>UBGraphicsWidgetItem</name>
-    <message>
-        <source>Cannot load content</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Loading ...</source>
         <translation type="unfinished">Indlæser...</translation>

resources/i18n/sankore_de.ts

@@ -1577,10 +1577,6 @@
 </context>
 <context>
     <name>UBGraphicsWidgetItem</name>
-    <message>
-        <source>Cannot load content</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Loading ...</source>
         <translation type="unfinished">Lädt...</translation>

resources/i18n/sankore_el.ts

@@ -1577,10 +1577,6 @@
 </context>
 <context>
     <name>UBGraphicsWidgetItem</name>
-    <message>
-        <source>Cannot load content</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Loading ...</source>
         <translation type="unfinished">Φόρτωση...</translation>

resources/i18n/sankore_en.ts

@@ -1575,10 +1575,6 @@
 </context>
 <context>
     <name>UBGraphicsWidgetItem</name>
-    <message>
-        <source>Cannot load content</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Loading ...</source>
         <translation type="unfinished"></translation>

resources/i18n/sankore_en_UK.ts

@@ -1575,10 +1575,6 @@
 </context>
 <context>
     <name>UBGraphicsWidgetItem</name>
-    <message>
-        <source>Cannot load content</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Loading ...</source>
         <translation type="unfinished"></translation>

resources/i18n/sankore_es.ts

@@ -1577,10 +1577,6 @@
 </context>
 <context>
     <name>UBGraphicsWidgetItem</name>
-    <message>
-        <source>Cannot load content</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Loading ...</source>
         <translation type="unfinished">Cargando...</translation>

resources/i18n/sankore_fr.ts

@@ -1582,10 +1582,6 @@
 </context>
 <context>
     <name>UBGraphicsWidgetItem</name>
-    <message>
-        <source>Cannot load content</source>
-        <translation>Impossible de charger le contenu</translation>
-    </message>
     <message>
         <source>Loading ...</source>
         <translation>Chargement en cours ...</translation>

resources/i18n/sankore_fr_CH.ts

@@ -1582,10 +1582,6 @@
 </context>
 <context>
     <name>UBGraphicsWidgetItem</name>
-    <message>
-        <source>Cannot load content</source>
-        <translation>Impossible de charger le contenu</translation>
-    </message>
     <message>
         <source>Loading ...</source>
         <translation>Chargement en cours ...</translation>

resources/i18n/sankore_it.ts

@@ -1579,10 +1579,6 @@ Sei sicuro di voler rimuovere %n pagina(e) dal documento '%1' selezion
 </context>
 <context>
     <name>UBGraphicsWidgetItem</name>
-    <message>
-        <source>Cannot load content</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Loading ...</source>
         <translation type="unfinished">Caricamento in corso...</translation>

resources/i18n/sankore_iw.ts

@@ -1577,10 +1577,6 @@
 </context>
 <context>
     <name>UBGraphicsWidgetItem</name>
-    <message>
-        <source>Cannot load content</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Loading ...</source>
         <translation type="unfinished">טוען...</translation>

resources/i18n/sankore_ja.ts

@@ -1575,10 +1575,6 @@
 </context>
 <context>
     <name>UBGraphicsWidgetItem</name>
-    <message>
-        <source>Cannot load content</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Loading ...</source>
         <translation type="unfinished">ローディング中… </translation>

resources/i18n/sankore_ko.ts

@@ -1575,10 +1575,6 @@
 </context>
 <context>
     <name>UBGraphicsWidgetItem</name>
-    <message>
-        <source>Cannot load content</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Loading ...</source>
         <translation type="unfinished">불러오는 중 ...</translation>

resources/i18n/sankore_mg.ts

@@ -1577,10 +1577,6 @@
 </context>
 <context>
     <name>UBGraphicsWidgetItem</name>
-    <message>
-        <source>Cannot load content</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Loading ...</source>
         <translation type="unfinished">Maka ...</translation>

resources/i18n/sankore_nb.ts

@@ -1580,10 +1580,6 @@
 </context>
 <context>
     <name>UBGraphicsWidgetItem</name>
-    <message>
-        <source>Cannot load content</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Loading ...</source>
         <translation type="unfinished">Laster ...</translation>

resources/i18n/sankore_nl.ts

@@ -1577,10 +1577,6 @@
 </context>
 <context>
     <name>UBGraphicsWidgetItem</name>
-    <message>
-        <source>Cannot load content</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Loading ...</source>
         <translation type="unfinished">Wordt geladen...</translation>

resources/i18n/sankore_pl.ts

@@ -1584,10 +1584,6 @@
 </context>
 <context>
     <name>UBGraphicsWidgetItem</name>
-    <message>
-        <source>Cannot load content</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Loading ...</source>
         <translation type="unfinished">Wczytywanie...</translation>

resources/i18n/sankore_pt.ts

@@ -1580,10 +1580,6 @@
 </context>
 <context>
     <name>UBGraphicsWidgetItem</name>
-    <message>
-        <source>Cannot load content</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Loading ...</source>
         <translation type="unfinished">A carregar ...</translation>

resources/i18n/sankore_rm.ts

@@ -1575,10 +1575,6 @@
 </context>
 <context>
     <name>UBGraphicsWidgetItem</name>
-    <message>
-        <source>Cannot load content</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Loading ...</source>
         <translation type="unfinished"></translation>

resources/i18n/sankore_ro.ts

@@ -1577,10 +1577,6 @@
 </context>
 <context>
     <name>UBGraphicsWidgetItem</name>
-    <message>
-        <source>Cannot load content</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Loading ...</source>
         <translation type="unfinished">Încărcare ...</translation>

resources/i18n/sankore_ru.ts

@@ -1577,10 +1577,6 @@
 </context>
 <context>
     <name>UBGraphicsWidgetItem</name>
-    <message>
-        <source>Cannot load content</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Loading ...</source>
         <translation type="unfinished">Загрузка...</translation>

resources/i18n/sankore_sk.ts

@@ -1581,10 +1581,6 @@
 </context>
 <context>
     <name>UBGraphicsWidgetItem</name>
-    <message>
-        <source>Cannot load content</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Loading ...</source>
         <translation type="unfinished">Nahráva sa...</translation>

resources/i18n/sankore_sv.ts

@@ -1577,10 +1577,6 @@
 </context>
 <context>
     <name>UBGraphicsWidgetItem</name>
-    <message>
-        <source>Cannot load content</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Loading ...</source>
         <translation type="unfinished">Laddar ...</translation>

resources/i18n/sankore_tr.ts

@@ -1576,10 +1576,6 @@
 </context>
 <context>
     <name>UBGraphicsWidgetItem</name>
-    <message>
-        <source>Cannot load content</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Loading ...</source>
         <translation type="unfinished">Yükleniyor ...</translation>

resources/i18n/sankore_zh.ts

@@ -1575,10 +1575,6 @@
 </context>
 <context>
     <name>UBGraphicsWidgetItem</name>
-    <message>
-        <source>Cannot load content</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Loading ...</source>
         <translation type="unfinished">载入中……</translation>

resources/library/applications/Editeur HTML.wgt/languages.js

@@ -20,8 +20,8 @@ var sankoreLang = {
     "fr":{
         "enter_title": "Entrer le titre yuor ici ...",
         "welcome":"Bienvenue sur HTML Editor",
-        "source":"Source",
-        "link":"Lien",
+        "source":"Ajouter un lien vers une image",
+        "link":"Ajouter une URL",
         "preview":"Aperçu",
         "text_to_link":"Votre texte à lier",
         "alt_text":"Texte alternatif"

resources/library/applications/Notes.wgt/config.xml

@@ -3,7 +3,7 @@
 		xmlns:ub="http://uniboard.mnemis.com/widgets"
         id="http://uniboard.mnemis.com/widgets/notes" 
         version="1.2"
-        width="302"
+        width="320"
         height="260" 
         ub:resizable="true">     
    

resources/library/applications/Notes.wgt/css/ubwidget.css

@@ -1,215 +1,219 @@
 * {
-	margin: 0;
-	padding: 0;
+    margin: 0;
+    padding: 0;
 }
 
-body{
-	margin:0px;
+body, html{
+    margin:0px;
+    height: 96%;
 }
 
 .ubw-container{
-	text-overflow: ellipsis;
-	left:0px;
-	top:0px;
-	margin:0px;
-	/*background-color: #edf7c0;*/
-	background-image: url(../images/back.png);
-	overflow: hidden;
-	border-right: 1px solid rgb(252, 252, 220);
-	border-left: 1px solid rgb(232, 232, 220);
+    min-width: 280px;
+    min-height: 200px;
+    width: 99%;
+    height: 100%;
+    text-overflow: ellipsis;
+    left:0px;
+    top:0px;
+    margin:0px;
+    background-image: url(../images/back.png);
+    overflow: hidden;
+    border-right: 1px solid rgb(252, 252, 220);
+    border-left: 1px solid rgb(232, 232, 220);
 }
 
 .ubw-body{
 }
 
 .head{
-	border-top: 1px solid rgb(252, 252, 220);
-	position: relative;
-	background-color: transparent;
-	font-style: normal;
-	color: #263141;
-	font-size: 119%;
-	width: auto;
-	height: 20px;
-	font-family: Arial, Helvetica, sans-serif;
-	font-weight: normal;
-	outline: none;
-	border-bottom: rgb(252, 252, 220);	
+    border-top: 1px solid rgb(252, 252, 220);
+    position: relative;
+    background-color: transparent;
+    font-style: normal;
+    color: #263141;
+    font-size: 119%;
+    width: auto;
+    height: 20px;
+    font-family: Arial, Helvetica, sans-serif;
+    font-weight: normal;
+    outline: none;
+    border-bottom: rgb(252, 252, 220);	
 
 
 }
 .stickytitle{
-	background-color: transparent;
-	min-width: 10px;
-	max-width: 70%;
-	width: 100%;
-	padding-top: 4px;
-	height: 20px;
-	float: left;
-	z-index: 3;
-	position: relative;
-	overflow:hidden;
-	margin-left: 10px;
-	margin-right: -2px;
-	font-style: normal;
-	color: #444444;
-	font-size: 88%;
-	border-style: none;
-	outline: none;
-	font-family: Arial, Helvetica, sans-serif;
-	font-weight: normal;
-	text-align: left;
-	resize: none;
+    background-color: transparent;
+    min-width: 10px;
+    max-width: 70%;
+    width: 100%;
+    padding-top: 4px;
+    height: 20px;
+    float: left;
+    z-index: 3;
+    position: relative;
+    overflow:hidden;
+    margin-left: 10px;
+    margin-right: -2px;
+    font-style: normal;
+    color: #444444;
+    font-size: 88%;
+    border-style: none;
+    outline: none;
+    font-family: Arial, Helvetica, sans-serif;
+    font-weight: normal;
+    text-align: left;
+    resize: none;
 }
 
 .textField{
-	min-height: 50px;
-	overflow-y: auto;
-	overflow-x: hidden;
-	height: auto;
-	width: auto;
-	margin: 5px;
-	padding-right: 4%;
-	background-position: 0;
-	border-left-style: none;
-	border-bottom-style: none;
-	border-right-style: none;
-	border-top-style: none;
-	text-align: left;
-	list-style-type: none;
-	outline: none;
-	word-wrap: break-word;
-	font-style: normal;
-	font-weight: normal;
-	font-family: Arial, Helvetica, sans-serif;
-	color:#444444;
+    min-height: 50px;
+    overflow-y: auto;
+    overflow-x: hidden;
+    height: auto;
+    width: auto;
+    margin: 5px;
+    padding-right: 4%;
+    background-position: 0;
+    border-left-style: none;
+    border-bottom-style: none;
+    border-right-style: none;
+    border-top-style: none;
+    text-align: left;
+    list-style-type: none;
+    outline: none;
+    word-wrap: break-word;
+    font-style: normal;
+    font-weight: normal;
+    font-family: Arial, Helvetica, sans-serif;
+    color:#444444;
 }
 
 .ubw-inspector{
-	position:absolute;
-	background-color:rgb(252, 252, 252);
-	border:1px solid #cccccc;	
-	line-height:20px;
-	font-family:Arial, Helvetica, sans-serif;
-	font-weight:normal;
-	font-size:20px;
-	color:#333333;
+    position:absolute;
+    background-color:rgb(252, 252, 252);
+    border:1px solid #cccccc;	
+    line-height:20px;
+    font-family:Arial, Helvetica, sans-serif;
+    font-weight:normal;
+    font-size:20px;
+    color:#333333;
 }
 
 .ubw-inpubox{
-	min-width:28px;
-	min-height:37px;
-	color:#333333;
-	background-image: url(../images/button_out.png);
-	border-left:1px solid rgb(231, 231, 231);
-	border-right:1px solid rgb(231, 231, 231);
-	border-bottom:1px solid rgb(221, 221, 221);
-	border-top:1px solid rgb(241, 241, 241);
+    min-width:28px;
+    min-height:37px;
+    color:#333333;
+    background-image: url(../images/button_out.png);
+    border-left:1px solid rgb(231, 231, 231);
+    border-right:1px solid rgb(231, 231, 231);
+    border-bottom:1px solid rgb(221, 221, 221);
+    border-top:1px solid rgb(241, 241, 241);
 }
 
 /*BUTTONS*/
 
 .ubw-button-wrapper{
-	float:left;
-	position:relative;
-	/*border:solid 1px yellow;*/
-	margin-right:-7px;
-	z-index:0;
-	font-family:Arial, Helvetica, sans-serif;
-	font-weight:normal;
-	font-size:30px;
-	overflow:visible;
+    float:left;
+    position:relative;
+    /*border:solid 1px yellow;*/
+    margin-right:-7px;
+    z-index:0;
+    font-family:Arial, Helvetica, sans-serif;
+    font-weight:normal;
+    font-size:30px;
+    overflow:visible;
 }
 
 .ubw-button-canvas{
-	width:auto;
-	float:left;
-	position:relative;
-	overflow:visible;
+    width:auto;
+    float:left;
+    position:relative;
+    overflow:visible;
 }
 
 table{
-	line-height:90%;
+    line-height:90%;
 }
 
 .ubw-dropdown{
-	margin: 0;
-	padding: 0;
-	font-size: 15px;
-	width:100px;
-	list-style: none;
-	cursor:pointer;
-	float:none;
-	margin-left:3px;
-}
-	
-	.ubw-dropdown li.out{
-		padding-left: 5px;
-		color:#444444;
-		border-left:1px solid rgb(231, 231, 233);
-		border-right:1px solid rgb(231, 231, 233);
-		background-image: url(../images/button_out.gif);
-	}
-	
-	.ubw-dropdown li.over{
-		padding-left: 5px;
-		color:#eeeeee;
-		border-left:1px solid rgb(140, 140, 140);
-		border-right:1px solid rgb(140, 140, 140);
-		background-image: url(../images/button_out_dark.png);
-	}
-	
-	.ubw-dropdown li.ubw-dropdown-top-corners{
-		border-top:1px solid rgb(241, 241, 244);
-	}
-	
-	.ubw-dropdown li.ubw-dropdown-bottom-corners{
-	    border-bottom:1px solid rgb(221, 221, 223);
-	}
+    margin: 0;
+    padding: 0;
+    font-size: 15px;
+    width:100px;
+    list-style: none;
+    cursor:pointer;
+    float:none;
+    margin-left:3px;
+}
+
+.ubw-dropdown li.out{
+    padding-left: 5px;
+    color:#444444;
+    border-left:1px solid rgb(231, 231, 233);
+    border-right:1px solid rgb(231, 231, 233);
+    background-image: url(../images/button_out.gif);
+}
+
+.ubw-dropdown li.over{
+    padding-left: 5px;
+    color:#eeeeee;
+    border-left:1px solid rgb(140, 140, 140);
+    border-right:1px solid rgb(140, 140, 140);
+    background-image: url(../images/button_out_dark.png);
+}
+
+.ubw-dropdown li.ubw-dropdown-top-corners{
+    border-top:1px solid rgb(241, 241, 244);
+}
+
+.ubw-dropdown li.ubw-dropdown-bottom-corners{
+    border-bottom:1px solid rgb(221, 221, 223);
+}
 
 .ubw-button-body{
-	position:relative;
-	float:left;
+    position:relative;
+    float:left;
 
-	width:auto;
-	height:auto;
-	overflow:visible
+    width:auto;
+    height:auto;
+    overflow:visible
 
-	text-align:center;
-	vertical-align:middle;		
+        text-align:center;
+    vertical-align:middle;		
 
-	cursor:pointer;		
+    cursor:pointer;		
 }
 
 .ubw-button-content{
-	margin:2px;
-	height:auto;
-	width:auto;
-	text-align:center;
-	overflow:visible;
+    margin:2px;
+    height:auto;
+    width:auto;
+    text-align:center;
+    overflow:visible;
 }
 
 
 .ubw-button-over{
-	color:#444444;
-	background-image: url(../images/button_out.gif);
-	border-left:1px solid rgb(221, 221, 221);
-	border-right:1px solid rgb(221, 221, 221);
-	border-bottom:1px solid rgb(211, 211, 211);
-	border-top:1px solid rgb(231, 231, 231);
+    color:#444444;
+    background-image: url(../images/button_out.gif);
+    border-left:1px solid rgb(221, 221, 221);
+    border-right:1px solid rgb(221, 221, 221);
+    border-bottom:1px solid rgb(211, 211, 211);
+    border-top:1px solid rgb(231, 231, 231);
 }
 
 .ubw-button-out{
-	color:#555555;
-	background-image: url(../images/button_out.gif);
-	border-left:2px solid rgb(231, 231, 233);
-	border-right:2px solid rgb(231, 231, 233);
-	border-bottom:2px solid rgb(221, 221, 223);
-	border-top:2px solid rgb(241, 241, 244);
+    color:#555555;
+    background-image: url(../images/button_out.gif);
+    border-left:2px solid rgb(231, 231, 233);
+    border-right:2px solid rgb(231, 231, 233);
+    border-bottom:2px solid rgb(221, 221, 223);
+    border-top:2px solid rgb(241, 241, 244);
 }
 
 span.colored{
-	color: #0080ff;
+    color: #0080ff;
 }
 
 
@@ -217,8 +221,8 @@ span.colored{
 
 
 .menuElement{
-	position: relative;
-	float:right;
+    position: relative;
+    float:right;
 }
 
 

resources/library/applications/Notes.wgt/js/jquery.ubwidget.js

@@ -29,8 +29,6 @@
 	// Default options
 	
 	jQuery.fn.ubwidget.defaults = {
-		width:250,
-		height:300
 	};
 	
 	// Shadows

resources/library/applications/Notes.wgt/js/ubw-main.js

@@ -16,8 +16,8 @@
 function init(){
 	
     var ubwidget = $("#ubwidget").ubwidget({
-        width:360,
-        height:240
+//        width:360,
+//        height:240
     });
 	
     var checkMinimize = false;
@@ -108,6 +108,7 @@ function init(){
 			
     minimize.click(
         function(){
+            $('.ubw-container').css("min-height", "26px")
             $('.ubw-container').animate({
                 height:"26px"
             },500);
@@ -127,7 +128,7 @@ function init(){
             var lastHeight = String(minimizedHeight)+'px';
             $('.ubw-container').animate({
                 height: lastHeight
-            },500);
+            },500, function(){$('.ubw-container').css("min-height", "200px").css("height","")});
 
             maximize.hide();
             minimize.show();
@@ -190,8 +191,8 @@ function init(){
         text = window.sankore.preference('noteText', text);
         currentFontSize = window.sankore.preference('fontSize', defaultFontSize);
         $('.ubw-container').css({
-            width:window.innerWidth - 2,
-            height:window.innerHeight - 20
+//            width:window.innerWidth - 2,
+//            height:window.innerHeight - 20
         });
 
         if(checkMinimize){
@@ -212,25 +213,24 @@ function init(){
         winwidth = window.innerWidth;
         winheight = window.innerHeight;
 		  	
-        if(winwidth <= 290)
-        {
-            window.resizeTo(290,winheight);
-        }
-        if(winheight <= 100)
-        {
-            window.resizeTo(winwidth,100);
-        }
-        if(winheight > 600)
-        {
-            window.resizeTo(winwidth,600);
-        }      		
-
-        $('.ubw-container').width(winwidth-2);
-			
+//        if(winwidth <= 290)
+//        {
+//            window.resizeTo(290,winheight);
+//        }
+//        if(winheight <= 100)
+//        {
+//            window.resizeTo(winwidth,100);
+//        }
+//        if(winheight > 600)
+//        {
+//            window.resizeTo(winwidth,600);
+//        }      		
+
+//        $('.ubw-container').width(winwidth-2);
+//			
         if(checkMinimize)					
             minimizedHeight = winheight-40; 
-        else
-            $('.ubw-container').height(winheight-40);
+
 
         controlTextField();  
     }

resources/library/interactivities/Ass images.wgt/css/basic.css

@@ -5,6 +5,7 @@ html, body{
     padding: 0;
     border-radius: 35px;
     overflow: hidden;    
+    font-family: sans-serif;
 }
 
 .without_radius{
@@ -280,7 +281,7 @@ body{
     margin: 10px 10px 0 10px;
     padding: 0;
     float: left;
-    font-family: Arial,Helvetica,sans-serif;
+    font-family: sans-serif;
     font-size: 24px;
     color: #7F613F;
     text-shadow: #FFDCA9 0 1px 0;
@@ -290,7 +291,7 @@ body{
     cursor: pointer;
     margin: 10px 10px 0 0;
     float: right;
-    font-family: Arial,Helvetica,sans-serif;
+    font-family: sans-serif;
     font-size: 24px;    
     line-height: 32px;
 }
@@ -407,7 +408,7 @@ body{
 
 .inline{
     display: inline-block;
-    font-family: "helvetica neue";
+    font-family: sans-serif;
     font-size: 14px;
     color: #666;
 }

resources/library/interactivities/Ass sons.wgt/config.xml

@@ -4,7 +4,7 @@
         id="http://uniboard.mnemis.com/widgets/notes" 
         version="1.2"
         width="950"
-        height="530" 
+        height="600" 
         ub:resizable="true">     
    
 		<name>Notes</name>

resources/library/interactivities/Ass sons.wgt/css/basic.css

@@ -5,6 +5,7 @@ html, body{
     padding: 0;
     border-radius: 35px;
     overflow: hidden;
+    font-family: sans-serif;
 }
 
 body{
@@ -315,7 +316,7 @@ body{
     margin: 10px 10px 0 10px;
     padding: 0;
     float: left;
-    font-family: Arial,Helvetica,sans-serif;
+    font-family: sans-serif;
     font-size: 24px;
     color: #7F613F;
     text-shadow: #FFDCA9 0 1px 0;
@@ -325,7 +326,7 @@ body{
     cursor: pointer;
     margin: 10px 10px 0 0;
     float: right;
-    font-family: Arial,Helvetica,sans-serif;
+    font-family: sans-serif;
     font-size: 24px;    
     line-height: 32px;
 }
@@ -351,22 +352,6 @@ body{
     text-shadow: #FFDCA9 0 1px 0;
 }
 
-.style_select{    
-    width: 120px;
-    /*font-family: "Lobster13Regular";*/
-    font-size: 24px;
-    float: right;
-    margin: 10px 20px 0 0;
-    border-radius: 10px;
-    background-image: url(../img/ar_down.png);
-    background-color: #d4aa79;
-    color: #8c5730;
-    background-position: 105px 11px;
-    background-repeat: no-repeat;
-    -webkit-appearance: menulist-text;
-    display: none;
-}
-
 .btl_pad{
     background-image: url(../img/pad-top-left.png) !important;
 }
@@ -463,7 +448,7 @@ body{
 
 .inline{
     display: inline-block;
-    font-family: "helvetica neue";
+    font-family: sans-serif;
     font-size: 14px;
     color: #666;
 }