merge conflicts resolved

.gitignore

@@ -46,6 +46,9 @@ Thumbs.db
 *.ncb
 *.pro.user
 *.idb
+.project
+.settings
+Makefile.Sankore*
 
 # Build files #
 ###############

Sankore 3.1.iss

@@ -6,8 +6,8 @@
 ; Do not use the same AppId value in installers for other applications.
 ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
 AppId={{E63D17F8-D9DA-479D-B9B5-0D101A03703B}
-AppName=Open-Sankore
-AppVerName=Open-Sankore
+AppName=Open-Sankor
+AppVerName=Open-Sankor
 AppPublisher=Open-Sankore
 
 AppPublisherURL=http://dev.open-sankore.org
@@ -15,7 +15,7 @@ AppSupportURL=http://dev.open-sankore.org
 AppUpdatesURL=http://dev.open-sankore.org
 
 DefaultDirName={pf}\Open-Sankore
-DefaultGroupName=Open-Sankore
+DefaultGroupName=Open-Sankor
 
 OutputDir=.\install\win32\
 OutputBaseFilename=Open-Sankore
@@ -48,48 +48,48 @@ Source: "..\Sankore-ThirdParty\microsoft\vcredist_x86.exe"; DestDir:"{tmp}"
 Source: "build\win32\release\product\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
 
 ;Sankore plugins
-Source: "plugins\cffadaptor\build\win32\release\lib\CFF_Adaptor.dll"; DestDir: "{app}"; Flags: ignoreversion
+;Source: "plugins\cffadaptor\build\win32\release\lib\CFF_Adaptor.dll"; DestDir: "{app}"; Flags: ignoreversion
 
 ;OpenSSL
 Source: "..\Sankore-ThirdParty\openssl\win32\libeay32.dll"; DestDir:"{app}"; Flags: ignoreversion
 Source: "..\Sankore-ThirdParty\openssl\win32\ssleay32.dll"; DestDir:"{app}"; Flags: ignoreversion
 
 ;Qt base dll
-Source: "..\Qt-sankore3.1\lib\QtScript4.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\Qt-sankore3.1\lib\QtGui4.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\Qt-sankore3.1\lib\QtXml4.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\Qt-sankore3.1\lib\QtCore4.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\Qt-sankore3.1\lib\QtWebKit4.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\Qt-sankore3.1\lib\phonon4.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\Qt-sankore3.1\lib\QtNetwork4.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\Qt-sankore3.1\lib\QtSvg4.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\Qt-4.8\lib\QtScript4.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\Qt-4.8\lib\QtGui4.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\Qt-4.8\lib\QtXml4.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\Qt-4.8\lib\QtCore4.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\Qt-4.8\lib\QtWebKit4.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\Qt-4.8\lib\phonon4.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\Qt-4.8\lib\QtNetwork4.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\Qt-4.8\lib\QtSvg4.dll"; DestDir: "{app}"; Flags: ignoreversion
 
 ;Qt plugins
-Source: "..\Qt-sankore3.1\plugins\accessible\qtaccessiblecompatwidgets4.dll"; DestDir: "{app}\accessible"; Flags: ignoreversion
-Source: "..\Qt-sankore3.1\plugins\accessible\qtaccessiblewidgets4.dll"; DestDir: "{app}\accessible"; Flags: ignoreversion
-Source: "..\Qt-sankore3.1\plugins\bearer\qgenericbearer4.dll"; DestDir: "{app}\bearer"; Flags: ignoreversion
-Source: "..\Qt-sankore3.1\plugins\bearer\qnativewifibearer4.dll"; DestDir: "{app}\bearer"; Flags: ignoreversion
-Source: "..\Qt-sankore3.1\plugins\codecs\qcncodecs4.dll"; DestDir: "{app}\codecs"; Flags: ignoreversion
-Source: "..\Qt-sankore3.1\plugins\codecs\qjpcodecs4.dll"; DestDir: "{app}\codecs"; Flags: ignoreversion
-Source: "..\Qt-sankore3.1\plugins\codecs\qkrcodecs4.dll"; DestDir: "{app}\codecs"; Flags: ignoreversion
-Source: "..\Qt-sankore3.1\plugins\codecs\qtwcodecs4.dll"; DestDir: "{app}\codecs"; Flags: ignoreversion
-Source: "..\Qt-sankore3.1\plugins\graphicssystems\qglgraphicssystem4.dll"; DestDir: "{app}\graphicssystems"; Flags: ignoreversion
-Source: "..\Qt-sankore3.1\plugins\graphicssystems\qtracegraphicssystem4.dll"; DestDir: "{app}\graphicssystems"; Flags: ignoreversion
-Source: "..\Qt-sankore3.1\plugins\iconengines\qsvgicon4.dll"; DestDir: "{app}\iconengines"; Flags: ignoreversion
-Source: "..\Qt-sankore3.1\plugins\imageformats\qgif4.dll"; DestDir: "{app}\imageformats"; Flags: ignoreversion
-Source: "..\Qt-sankore3.1\plugins\imageformats\qico4.dll"; DestDir: "{app}\imageformats"; Flags: ignoreversion
-Source: "..\Qt-sankore3.1\plugins\imageformats\qjpeg4.dll"; DestDir: "{app}\imageformats"; Flags: ignoreversion
-Source: "..\Qt-sankore3.1\plugins\imageformats\qmng4.dll"; DestDir: "{app}\imageformats"; Flags: ignoreversion
-Source: "..\Qt-sankore3.1\plugins\imageformats\qsvg4.dll"; DestDir: "{app}\imageformats"; Flags: ignoreversion
-Source: "..\Qt-sankore3.1\plugins\imageformats\qtiff4.dll"; DestDir: "{app}\imageformats"; Flags: ignoreversion
-Source: "..\Qt-sankore3.1\plugins\phonon_backend\phonon_ds94.dll"; DestDir: "{app}\phonon_backend"; Flags: ignoreversion
+Source: "..\Qt-4.8\plugins\accessible\qtaccessiblecompatwidgets4.dll"; DestDir: "{app}\accessible"; Flags: ignoreversion
+Source: "..\Qt-4.8\plugins\accessible\qtaccessiblewidgets4.dll"; DestDir: "{app}\accessible"; Flags: ignoreversion
+Source: "..\Qt-4.8\plugins\bearer\qgenericbearer4.dll"; DestDir: "{app}\bearer"; Flags: ignoreversion
+Source: "..\Qt-4.8\plugins\bearer\qnativewifibearer4.dll"; DestDir: "{app}\bearer"; Flags: ignoreversion
+Source: "..\Qt-4.8\plugins\codecs\qcncodecs4.dll"; DestDir: "{app}\codecs"; Flags: ignoreversion
+Source: "..\Qt-4.8\plugins\codecs\qjpcodecs4.dll"; DestDir: "{app}\codecs"; Flags: ignoreversion
+Source: "..\Qt-4.8\plugins\codecs\qkrcodecs4.dll"; DestDir: "{app}\codecs"; Flags: ignoreversion
+Source: "..\Qt-4.8\plugins\codecs\qtwcodecs4.dll"; DestDir: "{app}\codecs"; Flags: ignoreversion
+Source: "..\Qt-4.8\plugins\graphicssystems\qglgraphicssystem4.dll"; DestDir: "{app}\graphicssystems"; Flags: ignoreversion
+Source: "..\Qt-4.8\plugins\graphicssystems\qtracegraphicssystem4.dll"; DestDir: "{app}\graphicssystems"; Flags: ignoreversion
+Source: "..\Qt-4.8\plugins\iconengines\qsvgicon4.dll"; DestDir: "{app}\iconengines"; Flags: ignoreversion
+Source: "..\Qt-4.8\plugins\imageformats\qgif4.dll"; DestDir: "{app}\imageformats"; Flags: ignoreversion
+Source: "..\Qt-4.8\plugins\imageformats\qico4.dll"; DestDir: "{app}\imageformats"; Flags: ignoreversion
+Source: "..\Qt-4.8\plugins\imageformats\qjpeg4.dll"; DestDir: "{app}\imageformats"; Flags: ignoreversion
+Source: "..\Qt-4.8\plugins\imageformats\qmng4.dll"; DestDir: "{app}\imageformats"; Flags: ignoreversion
+Source: "..\Qt-4.8\plugins\imageformats\qsvg4.dll"; DestDir: "{app}\imageformats"; Flags: ignoreversion
+Source: "..\Qt-4.8\plugins\imageformats\qtiff4.dll"; DestDir: "{app}\imageformats"; Flags: ignoreversion
+Source: "..\Qt-4.8\plugins\phonon_backend\phonon_ds94.dll"; DestDir: "{app}\phonon_backend"; Flags: ignoreversion
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [Icons]
-Name: "{group}\Open-Sankore"; Filename: "{app}\Open-Sankore.exe"
-Name: "{group}\{cm:UninstallProgram,Open-Sankore}"; Filename: "{uninstallexe}"
-Name: "{commondesktop}\Open-Sankore"; Filename: "{app}\Open-Sankore.exe"; Tasks: desktopicon
-Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\Open-Sankore"; Filename: "{app}\Open-Sankore.exe"; Tasks: quicklaunchicon
+Name: "{group}\Open-Sankor"; Filename: "{app}\Open-Sankore.exe"
+Name: "{group}\{cm:UninstallProgram,Open-Sankor}"; Filename: "{uninstallexe}"
+Name: "{commondesktop}\Open-Sankor"; Filename: "{app}\Open-Sankore.exe"; Tasks: desktopicon
+Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\Open-Sankor"; Filename: "{app}\Open-Sankore.exe"; Tasks: quicklaunchicon
 
 [Registry]
 Root: HKCR; Subkey: ".ubz"; ValueType: string; ValueName: ""; ValueData: "SankoreFile"; Flags: uninsdeletevalue
@@ -112,12 +112,12 @@ Root: HKLM64; Subkey: "SOFTWARE\Open-Sankore"; ValueType: dword; ValueName: "EMF
 Root: HKLM64; Subkey: "SOFTWARE\Open-Sankore\Defaults"; ValueType: dword; ValueName: "PDF: Enabled"; ValueData: "1"; Flags: uninsdeletevalue; Check: isProcessorX64
 
 Root: HKLM64; Subkey: "SOFTWARE\Wow6432Node\Microsoft\Internet Explorer\Low Rights\DragDrop\{{E63D17F8-D9DA-479D-B9B5-0D101A03703B}"; ValueType: dword; ValueName: "Policy"; ValueData: "3"; Flags: uninsdeletevalue; Check: isProcessorX64
-Root: HKLM64; Subkey: "SOFTWARE\Wow6432Node\Microsoft\Internet Explorer\Low Rights\DragDrop\{{E63D17F8-D9DA-479D-B9B5-0D101A03703B}"; ValueType: string; ValueName: "AppName"; ValueData: "Sankore 3.1.exe"; Flags: uninsdeletevalue; Check: isProcessorX64
+Root: HKLM64; Subkey: "SOFTWARE\Wow6432Node\Microsoft\Internet Explorer\Low Rights\DragDrop\{{E63D17F8-D9DA-479D-B9B5-0D101A03703B}"; ValueType: string; ValueName: "AppName"; ValueData: "Open-Sankore.exe"; Flags: uninsdeletevalue; Check: isProcessorX64
 Root: HKLM64; Subkey: "SOFTWARE\Wow6432Node\Microsoft\Internet Explorer\Low Rights\DragDrop\{{E63D17F8-D9DA-479D-B9B5-0D101A03703B}"; ValueType: string; ValueName: "AppPath"; ValueData: "{app}"; Flags: uninsdeletevalue; Check: isProcessorX64
 
 [Run]
 Filename: "{tmp}\vcredist_x86.exe";WorkingDir:"{tmp}"; Parameters: "/q:a/c:""VCREDI~3.EXE /q:a /c:""""msiexec /i vcredist.msi /qn"""""""; StatusMsg: Installing CRT ...
-Filename: "{app}\Open-Sankore.exe"; Description: "{cm:LaunchProgram,Open-Sankore}"; Flags: nowait postinstall
+Filename: "{app}\Open-Sankore.exe"; Description: "{cm:LaunchProgram,Open-Sankor}"; Flags: nowait postinstall skipifsilent 
 
 [UninstallDelete]
 ; cleanup and delete whole installation directory

Sankore_3.1.pro

@@ -11,10 +11,10 @@ linux-g++-64 {
     CONFIG += link_prl
 }
 
-VERSION_MAJ = 1
-VERSION_MIN = 50 
-VERSION_TYPE = a # a = alpha, b = beta, r = release, other => error
-VERSION_PATCH = 20
+VERSION_MAJ = 2
+VERSION_MIN = 00 
+VERSION_TYPE = b # a = alpha, b = beta, r = release, other => error
+VERSION_PATCH = 01
 
 VERSION = "$${VERSION_MAJ}.$${VERSION_MIN}.$${VERSION_TYPE}.$${VERSION_PATCH}"
 VERSION = $$replace(VERSION, "\\.r", "")
@@ -54,8 +54,8 @@ include(src/tools/tools.pri)
 include(src/desktop/desktop.pri)
 include(src/web/web.pri)
 include(src/transition/transition.pri)
-include(src/customWidgets/customWidgets.pri)
 include(src/interfaces/interfaces.pri)
+include(src/customWidgets/customWidgets.pri)
 
 DEPENDPATH += src/pdf-merger
 INCLUDEPATH += src/pdf-merger
@@ -109,7 +109,7 @@ MOC_DIR = $$BUILD_DIR/moc
 RCC_DIR = $$BUILD_DIR/rcc
 UI_DIR = $$BUILD_DIR/ui
 
-LIBS += "-Lplugins/cffadaptor/$$BUILD_DIR/lib" "-lCFF_Adaptor"
+#LIBS += "-Lplugins/cffadaptor/$$BUILD_DIR/lib" "-lCFF_Adaptor"
 
 win32 {
    RC_FILE = resources/win/sankore.rc
@@ -145,8 +145,8 @@ macx {
    # are not yet available in 64bits.
    CONFIG(debug, debug|release):CONFIG += x86
 
-   QMAKE_MAC_SDK = "/Developer/SDKs/MacOSX10.5.sdk"
-   QMAKE_MACOSX_DEPLOYMENT_TARGET = "10.4"
+   QMAKE_MAC_SDK = "/Developer/SDKs/MacOSX10.6.sdk"
+   QMAKE_MACOSX_DEPLOYMENT_TARGET = "10.5"
 
    VERSION_RC_PATH = "$$BUILD_DIR/version_rc"
 
@@ -311,12 +311,26 @@ macx {
    }
 
    exists(resources/i18n/sankore_sk.qm) {
-       TRANSLATION_pt.files = resources/i18n/sankore_sk.qm \
+       TRANSLATION_sk.files = resources/i18n/sankore_sk.qm \
            resources/i18n/Localizable.strings
-       TRANSLATION_pt.path = "$$RESOURCES_DIR/sk.lproj"
+       TRANSLATION_sk.path = "$$RESOURCES_DIR/sk.lproj"
        QMAKE_BUNDLE_DATA += TRANSLATION_sk
    }
    
+   exists(resources/i18n/sankore_bg.qm) {
+       TRANSLATION_bg.files = resources/i18n/sankore_bg.qm \
+           resources/i18n/Localizable.strings
+       TRANSLATION_bg.path = "$$RESOURCES_DIR/bg.lproj"
+       QMAKE_BUNDLE_DATA += TRANSLATION_bg
+   }
+   
+   exists(resources/i18n/sankore_ca.qm) {
+       TRANSLATION_ca.files = resources/i18n/sankore_ca.qm \
+           resources/i18n/Localizable.strings
+       TRANSLATION_ca.path = "$$RESOURCES_DIR/ca.lproj"
+       QMAKE_BUNDLE_DATA += TRANSLATION_ca
+   }
+   
    QMAKE_BUNDLE_DATA += UB_ETC \
        UB_LIBRARY \
        UB_FONTS \
@@ -407,10 +421,21 @@ TRANSLATIONS = resources/i18n/sankore_en.ts \
    resources/i18n/sankore_ar.ts \
    resources/i18n/sankore_iw.ts \
    resources/i18n/sankore_pt.ts \
-   resources/i18n/sankore_sk.ts
+   resources/i18n/sankore_sk.ts \
+   resources/i18n/sankore_bg.ts \
+   resources/i18n/sankore_ca.ts
 
 INSTALLS = UB_ETC \
    UB_I18N \
    UB_LIBRARY \
    UB_THIRDPARTY_INTERACTIVE
 
+HEADERS += \
+    plugins/cffadaptor/src/UBGlobals.h \
+    plugins/cffadaptor/src/UBCFFConstants.h \
+    plugins/cffadaptor/src/UBCFFAdaptor.h \
+    plugins/cffadaptor/src/UBCFFAdaptor_global.h
+
+SOURCES += \
+    plugins/cffadaptor/src/UBCFFAdaptor.cpp
+

Subdirs.pro

 TEMPLATE = subdirs
-CONFIG += recursive
+CONFIG += ordered
 CONFIG += debug_and_release
 
 win32:        SUB_DIR = win32
@@ -23,11 +23,11 @@ SANKORE_PLUGINS_DIR = $$SANKORE_DIR/plugins
 PLUGIN_CFF_ADAPTOR_DIR = $$SANKORE_PLUGINS_DIR/cffadaptor
 PLUGIN_CFF_ADAPTOR_PRO = $$PLUGIN_CFF_ADAPTOR_DIR/UBCFFAdaptor.pro
 
-if(exists($$PLUGIN_CFF_ADAPTOR_DIR)){
-    SUBDIRS += $$PLUGIN_CFF_ADAPTOR_PRO
-    $$SANKORE_PRO.depends = $$PLUGIN_CFF_ADAPTOR_PRO
+#visoal studio sets first project as executable
+contains(TEMPLATE, vcsubdirs):{
+    SUBDIRS = $$SANKORE_PRO $$PLUGIN_CFF_ADAPTOR_PRO
+} else:{
+    SUBDIRS = $$PLUGIN_CFF_ADAPTOR_PRO $$SANKORE_PRO
 }
-SUBDIRS += $$SANKORE_PRO
-
-recurse_target = $$SANKORE_PRO
 
+$$SANKORE_PRO.depends = $$PLUGIN_CFF_ADAPTOR_PRO    

release.linux.sh

@@ -113,6 +113,7 @@ notify-send "Git Hub" "Make a tag of the delivered version"
 VERSION=`cat $RELEASE_DIR/version`
 if [ ! -f $RELEASE_DIR/version ]; then
     notifyError "version not found"
+    exit 1
 else
     LAST_COMMITED_VERSION="`git describe $(git rev-list --tags --max-count=1)`"
     if [ "v$VERSION" != "$LAST_COMMITED_VERSION" ]; then
@@ -358,4 +359,4 @@ cd $RELEASE_DIR
 rm ../../../install/linux/Open-Sankore.tar.gz
 
 tar cvzf ../../../install/linux/Open-Sankore.tar.gz Open-Sankore.$VERSION -C . 
-notify-send "Open-Sankore"  "tar.gz Build done"
\ No newline at end of file
+notify-send "Open-Sankore"  "tar.gz Build done"

release.macx.sh

@@ -15,7 +15,7 @@
 # ---------------------------------------------------------------------
 
 
-BASE_TROLLTECH_DIRECTORY=/usr/local/Trolltech/Qt-4.7.3
+BASE_TROLLTECH_DIRECTORY=/usr/local/Trolltech/Qt-4.8.0
 # Executables
 QMAKE=$BASE_TROLLTECH_DIRECTORY/bin/qmake
 MACDEPLOYQT=$BASE_TROLLTECH_DIRECTORY/bin/macdeployqt
@@ -29,7 +29,7 @@ LRELEASE=$BASE_TROLLTECH_DIRECTORY/bin/lrelease
 # Directories
 BUILD_DIR="build/macx/release"
 PRODUCT_DIR="$BUILD_DIR/product"
-BASE_QT_TRANSLATIONS_DIRECTORY=../Qt-sankore3.1/translations
+BASE_QT_TRANSLATIONS_DIRECTORY=../Qt4.8/translations
 
 function notify {
     GROWLNOTIFY=`which growlnotify`
@@ -104,13 +104,14 @@ checkExecutable "$LRELEASE"
 notify "Cleaning ..."
 rm -rf "$BUILD_DIR"
 
-notify "Translations ..."
+# application translations
+notify "Generating applications translatons"
 $LRELEASE "Sankore_3.1.pro"
 
 # generate Makefiles
 notify "Generating Makefile ..."
 
-QMAKE_CMD="$QMAKE -spec macx-g++"
+QMAKE_CMD="$QMAKE Sankore_3.1.pro -spec macx-g++"
 
 $QMAKE_CMD
 
@@ -118,6 +119,8 @@ $QMAKE_CMD
 notify "Compiling ..."
 make -j4 release
 
+notify "Qt Translations ..."
+$LRELEASE $BASE_QT_TRANSLATIONS_DIRECTORY/translations.pro 
 addQtTranslations
 
 cp -R resources/customizations $PRODUCT_DIR/Open-Sankore.app/Contents/Resources
@@ -131,8 +134,8 @@ else
     LAST_COMMITED_VERSION="`git describe $(git rev-list --tags --max-count=1)`"
     if [ "v$VERSION" != "$LAST_COMMITED_VERSION" ]; then
 	echo creating a tag with the version $VERSION
-#	git tag -a "v$VERSION" -m "Generated setup for v$VERSION"
-#	git push origin --tags
+	#git tag -a "v$VERSION" -m "Generated setup for v$VERSION"
+	#git push origin --tags
     fi
 fi
   
@@ -200,13 +203,16 @@ notify "Creating dmg ..."
 umount "$VOLUME" 2> /dev/null
 $DMGUTIL --open --volume="$NAME" "$DMG"
 
+cp *.pdf "$VOLUME"
 cp -R "$APP" "$VOLUME"
 ln -s /Applications "$VOLUME"
 
 $DMGUTIL --set --iconsize=96 --toolbar=false --icon=resources/macx/UniboardDmg.icns "$VOLUME"
-$DMGUTIL --set --x=20 --y=60 --width=580 --height=312 "$VOLUME"
-$DMGUTIL --set --x=180 --y=160 "$VOLUME/`basename \"$APP\"`"
-$DMGUTIL --set --x=400 --y=160 "$VOLUME/Applications"
+$DMGUTIL --set --x=20 --y=60 --width=580 --height=440 "$VOLUME"
+$DMGUTIL --set --x=180 --y=120 "$VOLUME/`basename \"$APP\"`"
+$DMGUTIL --set --x=400 --y=120 "$VOLUME/Applications"
+$DMGUTIL --set --x=180 --y=280 "$VOLUME/ReleaseNotes.pdf"
+$DMGUTIL --set --x=400 --y=280 "$VOLUME/JournalDesModifications.pdf"
 
 $DMGUTIL --close --volume="$NAME" "$DMG"
 

release.win7.vc9.bat

@@ -13,7 +13,7 @@ REM You should have received a copy of the GNU General Public License
 REM along with this program.  If not, see <http://www.gnu.org/licenses/>.
 REM ---------------------------------------------------------------------
 
-set QT_DIR=..\Qt-sankore3.1
+set QT_DIR=..\Qt-4.8
 set QT_BIN=%QT_DIR%\bin
 
 set PROGRAMS_FILE_PATH=C:\Program Files
@@ -35,15 +35,16 @@ echo %PATH%
 REM this checks if the custom qt directory path
 REM is correct. This is important because installer
 REM pick up dll from this directory
-IF NOT EXIST "..\Qt-sankore3.1\lib\QtCore4.dll" GOTO EXIT_WITH_ERROR
+IF NOT EXIST "%QT_DIR%\lib\QtCore4.dll" GOTO EXIT_WITH_ERROR
 
 rmdir /S /Q %BUILD_DIR%
 
 set EDITION=MNEMIS_EDITION
 
-"%QT_BIN%\qmake.exe" "DEFINES+=%EDITION%"
+"%QT_BIN%\qmake.exe" Sankore_3.1.pro "DEFINES+=%EDITION%"
 
 %LRELEASE% Sankore_3.1.pro
+%LRELEASE% %BASE_QT_TRANSLATIONS_DIRECTORY%\translations.pro
 
 REM set /p VERSION= < build\win32\release\version
 REM git rev-list --tags --max-count=1 > tmp
@@ -56,17 +57,16 @@ REM erase tmp
 REM echo %VERSION%
 REM echo %LAST_TAG_VERSION%
 
-REM if not v%VERSION%==%LAST_TAG_VERSION% GOTO EXIT_WITH_ERROR
-
 nmake release-install
 
+set CUSTOMIZATIONS=build\win32\release\product\customizations
+mkdir %CUSTOMIZATIONS%
+xcopy /s resources\customizations %CUSTOMIZATIONS%
 
-copy %BASE_QT_TRANSLATIONS_DIRECTORY%\qt_*.qm build\win32\release\product\i18n\
-mkdir build\win32\release\product\customizations
-xcopy /s resources\customizations\* build\win32\release\product\customizations
-
-copy plugins\cffadaptor\build\win32\release\lib\CFF_Adaptor.dll build\win32\release\product\
-
+set I18n=build\win32\release\product\i18n
+mkdir %I18n%
+xcopy /s resources\i18n\*.qm %I18n%
+xcopy /s %BASE_QT_TRANSLATIONS_DIRECTORY%\qt_*.qm %I18n%\
 
 del build\win32\release\product\i18n\qt_help*
 
@@ -78,5 +78,3 @@ set INSTALLER_PATH=.\install\win32\%INSTALLER_NAME%.exe
 
 call "%INNO_EXE%" "Sankore 3.1.iss" /F"%INSTALLER_NAME%"
 
-:EXIT_WITH_ERROR
-	echo ERROR

resources/customizations/teacherGuide/indexingParameters.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <teacherGuide>
     <gradeLevels>
+        <gradeLevel label="" baseLevel="Maternelle"/>
         <gradeLevel label="Petite Section (3-4 ans)" baseLevel="Maternelle"/>
         <gradeLevel label="Moyenne Section (4-5 ans)" baseLevel="Maternelle"/>
         <gradeLevel label="Grande Section (5-6 ans)" baseLevel="Maternelle"/>
@@ -22,6 +23,7 @@
         <gradeLevel label="Education Spécialisée" baseLevel="Enseignement Professionnel" />
     </gradeLevels>
     <subjects baseLevel="Maternelle">
+        <subject label="" />
         <subject label="Percevoir, sentir, imaginer, créer" />
         <subject label="Découvrir l'écrit" />
         <subject label="S'approprier le langage" />
@@ -29,6 +31,7 @@
         <subject label="Découvrir le monde" />
     </subjects>
     <subjects baseLevel="Elémentaire">
+        <subject label="" />
         <subject label="Pratiques artistiques" />
         <subject label="Pratiques artistiques - arts visuels" />
         <subject label="Pratiques artistiques - éducation musicale" />
@@ -50,6 +53,7 @@
         <subject label="TUIC" />
     </subjects>
     <subjects baseLevel="Collège">
+        <subject label="" />
         <subject label="Pratiques artistiques" />
         <subject label="Pratiques artistiques - arts visuels" />
         <subject label="Pratiques artistiques - éducation musicale" />
@@ -80,6 +84,7 @@
         <subject label="Education aux médias" />
     </subjects>
     <subjects baseLevel="Lycée">
+        <subject label="" />
         <subject label="Enseignements artistiques" />
         <subject label="Agriculture" />
         <subject label="Arts" />
@@ -125,6 +130,7 @@
         <subject label="Philosophie" />
     </subjects>
     <subjects baseLevel="Enseignement Professionnel">
+        <subject label="" />
         <subject label="Enseignements artistiques" />
         <subject label="Agriculture" />
         <subject label="Arts" />
@@ -169,6 +175,7 @@
         <subject label="Philosophie" />
     </subjects>
     <types>
+        <type label="" />
         <type label="Activité : Evaluation/Travail à la maison" />
         <type label="Activité : Exercice" />
         <type label="Activité : Travaux Pratiques" />

resources/etc/SankoreEditor/editor_en/index.html

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!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" />
-		<meta name="generator" content="RapidWeaver" />
-		
-		<title>Editor</title>
-		<link rel="stylesheet" type="text/css" media="screen" href="rw_common/themes/caribou/styles.css" />
-		<!--[if IE 6]><link rel="stylesheet" type="text/css" media="screen" href="rw_common/themes/caribou/css/ie6.css" /><![endif]-->
-		<link rel="stylesheet" type="text/css" media="screen" href="rw_common/themes/caribou/colourtag-theme-default.css" />
-		<link rel="stylesheet" type="text/css" media="print" href="rw_common/themes/caribou/print.css" />
-		<link rel="stylesheet" type="text/css" media="handheld" href="rw_common/themes/caribou/handheld.css" />
-		<!--[if IE]><style type="text/css" media="screen">body {behavior: url(rw_common/themes/caribou/csshover.htc);}</style><![endif]-->
-		<link rel="stylesheet" type="text/css" media="screen" href="rw_common/themes/caribou/css/banner/swirls.css" />
-		<link rel="stylesheet" type="text/css" media="screen" href="rw_common/themes/caribou/css/logo_position/center.css" />
-		<link rel="stylesheet" type="text/css" media="screen" href="rw_common/themes/caribou/css/sidebar/sidebar_right.css" />
-		<link rel="stylesheet" type="text/css" media="screen" href="rw_common/themes/caribou/css/icons/black.css" />
-		
-		
-		<script type="text/javascript" src="rw_common/themes/caribou/javascript.js"></script>
-		
-		
-		
-		
-		<script type="text/javascript" charset="utf-8">	var blankSrc = "rw_common/themes/caribou/png/blank.gif";</script>	
-		<style type="text/css">	img { behavior:	url("rw_common/themes/caribou/png/pngbehavior.htc"); }</style>
-	</head>
-	
-	<!-- This page was created with RapidWeaver from Realmac Software. http://www.realmacsoftware.com -->
+<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>
-<div id="bar"></div>
-<div id="container"><!-- Start container -->
-	<div id="pageHeader"><!-- Start page header -->
-		<div id="navcontainer"><!-- Start Navigation -->
-			<ul><li><a href="index.html" rel="self" id="current">Editor</a></li></ul>
-		</div><!-- End navigation --> 
-		<div id="title">
-			<div id="logo"></div>
-			<h1>Sankor&eacute; Editor</h1>
-			<h2>Instructions on how to use the Sankor&eacute; Editor</h2>
-			<div id="overlay_swirls"><img src="rw_common/themes/caribou/images/header_swirls.png" alt="" style="width: 900px; height: 150px;" /></div>
-			<div id="overlay_stripes_glow"><img src="rw_common/themes/caribou/images/header_stripes_glow.png" alt="" style="width: 900px; height: 150px;" /></div>
-			<div id="overlay_stripes_solid"><img src="rw_common/themes/caribou/images/header_stripes_solid.png" alt="" style="width: 900px; height: 150px;" /></div>
-			<div id="overlay_curve_solid"><img src="rw_common/themes/caribou/images/header_curve_solid.png" alt="" style="width: 900px; height: 150px;" /></div>
-		</div>
-		<div id="background"><img src="rw_common/themes/caribou/images/header_bg.png" alt="" style="width: 914px; height: 197px;" /></div>
-	</div><!-- End page header -->
-	
-	<div id="contentContainer"><!-- Start main content wrapper -->
-		<div id="content"><!-- Start content -->
-			<div class="contentSpacer"></div><!-- this makes sure the content is long enough for the design -->
-			<p style="text-align:center;"><br /><br /><br /></p><p style="text-align:left;"><span style="font:14px Trebuchet, Verdana, serif; font-weight:bold; font-weight:bold; ">The Sankor&eacute; Editor allows you to create rich interactivity scenarios to be used within the Sankor&eacute; 3.1 Software</span><span style="font:12px Trebuchet, Verdana, serif; "><br /></span><span style="font:11px Trebuchet, Verdana, serif; "><br />BEWARE : You must be connected to the Internet to use the editor and the current version is only available in french</span><span style="font:12px Trebuchet, Verdana, serif; "><br /><br /></span><span style="font:13px Trebuchet, Verdana, serif; ">When you get into the editor, you will need to authentify.<br /><br />In order to test it, you can, just as shown below, use the identifier and password &ldquo;demo&rdquo;.<br /></span><span style="font:12px Trebuchet, Verdana, serif; "><br /></span></p><p style="text-align:center;"><img class="imageStyle" alt="login_paraschool" src="files/login_paraschool.png" width="371" height="252" /><span style="font:12px Trebuchet, Verdana, serif; "><br /></span></p><p style="text-align:left;"><span style="font:12px Trebuchet, Verdana, serif; "><br /></span><span style="font:13px Trebuchet, Verdana, serif; ">If you wish to use it as your personal content creation tool, please send a mail to this </span><span style="font:13px Trebuchet, Verdana, serif; "><a href="mailto:daniel.lebret@gmail.com" rel="self">address</a></span><span style="font:13px Trebuchet, Verdana, serif; "> explaining you want to create an account for the Sankor&eacute; Editor.<br /><br /></span></p><p style="text-align:center;"><span style="font:13px Trebuchet, Verdana, serif; "><a href="http://editeur.sankore.org" rel="self">Click here to connect to the Sankor&eacute; Editor<br /></a></span><a href="http://editeur.sankore.org" rel="self"><img class="imageStyle" alt="connect_screen" src="files/connect_screen.png" width="303" height="75" /></a></p>
-			<div class="clearer"></div>
-		</div><!-- End content -->
-		
-	</div><!-- End main content wrapper -->
-	
-	<div id="sidebarContainer"><!-- Start Sidebar wrapper -->
-		<div id="sidebar"><!-- Start sidebar content -->
-		<div class="sideHeader"></div><!-- Sidebar header --> 
-			<!-- sidebar content you enter in the page inspector -->
-			 <!-- sidebar content such as the blog archive links -->
-		</div><!-- End sidebar content -->
-	</div><!-- End sidebar wrapper -->
-	
-	<div class="clearer"></div>
-	
-</div><!-- End container -->
-
-<div class="clearer"></div>
-<div id="footer"><!-- Start Footer -->
-	<p></p>
-	<div id="breadcrumbcontainer"><!-- Start the breadcrumb wrapper -->
-		
-	</div><!-- End breadcrumb -->
-</div><!-- End Footer -->
+<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>

resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/css/ie6.css

-#navcontainer a {
-	padding: 15px 15px 17px 15px;
-	height: 0px;
-}
\ No newline at end of file

resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/csshover.htc

-<attach event="ondocumentready" handler="parseStylesheets" />
-<script>
-/**
- *	Whatever:hover - V2.01.050927 - hover, active & focus
- *	------------------------------------------------------------
- *	(c) 2005 - Peter Nederlof
- *	Peterned - http://www.xs4all.nl/~peterned/
- *	License  - http://creativecommons.org/licenses/LGPL/2.1/
- *
- *	Whatever:hover is free software; you can redistribute it and/or
- *	modify it under the terms of the GNU Lesser General Public
- *	License as published by the Free Software Foundation; either
- *	version 2.1 of the License, or (at your option) any later version.
- *
- *	Whatever:hover is distributed in the hope that it will be useful,
- *	but WITHOUT ANY WARRANTY; without even the implied warranty of
- *	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- *	Lesser General Public License for more details.
- *
- *	Credits and thanks to:
- *	Arnoud Berendsen, Martin Reurings, Robert Hanson
- *
- *	howto: body { behavior:url("csshover.htc"); }
- *	------------------------------------------------------------
- */
-
-var csshoverReg = /(^|\s)((([^a]([^ ]+)?)|(a([^#.][^ ]+)+)):(hover|active))|((a|input|textarea):unknown)/i,
-currentSheet, doc = window.document, hoverEvents = [], activators = {
-	onhover:{on:'onmouseover', off:'onmouseout'},
-	onactive:{on:'onmousedown', off:'onmouseup'},
-	onunknown:{on:'onfocus', off:'onblur'}
-}
-
-function parseStylesheets() {
-	if(!/MSIE (5|6)/.test(navigator.userAgent)) return;
-	window.attachEvent('onunload', unhookHoverEvents);
-	var sheets = doc.styleSheets, l = sheets.length;
-	for(var i=0; i<l; i++) 
-		parseStylesheet(sheets[i]);
-}
-	function parseStylesheet(sheet) {
-		if(sheet.imports) {
-			try {
-				var imports = sheet.imports, l = imports.length;
-				for(var i=0; i<l; i++) parseStylesheet(sheet.imports[i]);
-			} catch(securityException){}
-		}
-
-		try {
-			var rules = (currentSheet = sheet).rules, l = rules.length;
-			for(var j=0; j<l; j++) parseCSSRule(rules[j]);
-		} catch(securityException){}
-	}
-
-	function parseCSSRule(rule) {
-		var select = rule.selectorText, style = rule.style.cssText;
-		if(!csshoverReg.test(select) || !style) return;
-		
-		var pseudo = select.replace(/[^:]+:([a-z-]+).*/i, 'on$1');
-		var newSelect = select.replace(/(\.([a-z0-9_-]+):[a-z]+)|(:[a-z]+)/gi, '.$2' + pseudo);
-		var className = (/\.([a-z0-9_-]*on(hover|active|unknown))/i).exec(newSelect)[1];
-		var affected = select.replace(/:(hover|active|unknown).*$/, '');
-		var elements = getElementsBySelect(affected);
-		if(elements.length == 0) return;
-
-		currentSheet.addRule(newSelect, style);
-		for(var i=0; i<elements.length; i++)
-			new HoverElement(elements[i], className, activators[pseudo]);
-	}
-
-function HoverElement(node, className, events) {
-	if(!node.hovers) node.hovers = {};
-	if(node.hovers[className]) return;
-	node.hovers[className] = true;
-	hookHoverEvent(node, events.on, function() { node.className += ' ' + className; });
-	hookHoverEvent(node, events.off, function() { node.className = node.className.replace(new RegExp('\\s+'+className, 'g'),''); });
-}
-	function hookHoverEvent(node, type, handler) {
-		node.attachEvent(type, handler);
-		hoverEvents[hoverEvents.length] = { 
-			node:node, type:type, handler:handler 
-		};
-	}
-
-	function unhookHoverEvents() {
-		for(var e,i=0; i<hoverEvents.length; i++) {
-			e = hoverEvents[i]; 
-			e.node.detachEvent(e.type, e.handler);
-		}
-	}
-
-function getElementsBySelect(rule) {
-	var parts, nodes = [doc];
-	parts = rule.split(' ');
-	for(var i=0; i<parts.length; i++) {
-		nodes = getSelectedNodes(parts[i], nodes);
-	}	return nodes;
-}
-	function getSelectedNodes(select, elements) {
-		var result, node, nodes = [];
-		var identify = (/\#([a-z0-9_-]+)/i).exec(select);
-		if(identify) return [doc.getElementById(identify[1])];
-		
-		var classname = (/\.([a-z0-9_-]+)/i).exec(select);
-		var tagName = select.replace(/(\.|\#|\:)[a-z0-9_-]+/i, '');
-		var classReg = classname? new RegExp('\\b' + classname[1] + '\\b'):false;
-		for(var i=0; i<elements.length; i++) {
-			result = tagName? elements[i].all.tags(tagName):elements[i].all; 
-			for(var j=0; j<result.length; j++) {
-				node = result[j];
-				if(classReg && !classReg.test(node.className)) continue;
-				nodes[nodes.length] = node;
-			}
-		}	return nodes;
-	}
-</script>
\ No newline at end of file

resources/etc/SankoreEditor/editor_en/rw_common/themes/caribou/handheld.css

-/*<group=General Styles>*/
-
-body {
-	text-align: left;
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 0.9em;
-	margin: 0px;
-	padding: 0;
-	white-space: pre;
-}
-
-p {
-}
-
-b, strong {
-
-}
-
-a:link {
-	color: #0000ff;
-	text-decoration: underline;
-}
-
-a:visited {
-	color: #681796;
-}
-
-a:hover, a:active {
-	text-decoration: none;
-	background: #0000ff;
-	color: #ffffff;
-}
-
-img {
-	max-width: 99%;
-}
-
-.image-left {
-
-}
-
-.image-right {
-
-}
-	
-/*</group>*/
-
-/*<group=Layout>*/
-
-#container { 
-	background: #ffffff;
-	background-image: none;
-	width: 100%;
-}
-
-#pageHeader {
-	height: auto;
-	text-align: left;
-	margin-bottom: 8px;
-	background: #000000;
-	padding: 3px;
-	border-bottom: solid #191919 2px;
-}
-
-#pageHeader img {
-	position: relative;
-	top: auto;
-	right: auto;
-}
-
-#pageHeader h1 {
-	color: #ffffff;
-	font-size: 1.3em;
-	margin: 0 0 5px;
-	padding-top: 0px;
-	font-weight: bold;
-}
-
-#pageHeader h2 {
-	font-size: 1.1em;
-	margin: 0;
-	color: #ffffff;
-	font-weight: normal;
-}
-
-#contentContainer {
-	margin: 0px;
-	display: block;
-	width: auto;
-}
-
-#contentContainer #content {
-	margin: 0;
-	padding: 0;
-}
-
-#sidebarContainer {
-	float: none;
-	width: auto;
-	display: block;
-	margin-bottom: 10px;
-	padding-bottom: 10px;
-	border-bottom: 1px solid #808080;
-}
-
-#sidebarContainer #sidebar {
-	margin: 0;
-	padding: 0px;
-}
-
-#sidebarContainer .sideHeader {
-	color: #000000;
-	font-weight: bold;
-	margin-bottom: 5px;
-}
-
-#footer { 
-	width: auto;
-	text-align: left;
-	padding: 0px;
-	margin: 0;
-}
-
-#footer p {
-}
-
-#footer a:link, #footer a:visited {
-
-}
-
-#footer a:hover, #footer a:active {
-}
-	
-/*</group>*/
-
-/*<group=Bread-crumb>*/
-
-#breadcrumbcontainer {
-	margin-bottom: 5px;
-}
-
-#breadcrumbcontainer ul {
-	list-style: none;
-	margin: 0;
-	padding: 0;
-}
-
-#breadcrumbcontainer li {
-	display: inline;
-	padding: 0;
-	margin: 0;
-}
-
-#breadcrumbcontainer a {
-	padding: 0;
-}
-
-#breadcrumbcontainer a:hover {
-
-}
-	
-/*</group>*/
-
-/*<group=Toolbar>*/
-
-/* Toolbar Styles */
-
-#navcontainer {
-	color: #000000;
-	margin: 0 0 10px 0;
-	padding: 0;
-}
-
-#navcontainer #current {
-
-}
-
-#navcontainer #current:hover {
-}
-
-#navcontainer .currentAncestor {
-
-}
-
-/* Parent - Level 0 */
-
-#navcontainer ul{
-	margin: 0;
-	padding: 0;
-	list-style-type: none;
-}
-
-#navcontainer li {
-	margin: 0;
-	padding: 0;
-}
-
-#navcontainer a {
-	padding: 0;
-}
-
-#navcontainer a:hover {
-}
-
-#navcontainer a:active {
-}
-
-/* Child - Level 1 */
-
-#navcontainer ul ul {
-	list-style-type: none;
-	margin-left: 2px;
-	padding: 0;
-	color: black;
-}
-
-#navcontainer ul ul li {
-	padding-left: 5px;
-}
-
-#navcontainer ul ul a {
-	padding: 0;
-}
-
-#navcontainer ul ul a:hover{
-}
-
-#navcontainer ul ul #current{
-}
-
-/* Child - Level 2 */
-
-#navcontainer ul ul ul {
-
-}
-
-#navcontainer ul ul ul li {
-	padding-left: 10px;
-}
-
-#navcontainer ul ul ul a{
-}
-
-#navcontainer ul ul ul a:hover{
-
-}
-
-/* Child Level 3 */
-
-#navcontainer ul ul ul {
-
-}
-
-#navcontainer ul ul ul ul li {
-	padding-left: 15px;
-}
-
-#navcontainer ul ul ul ul a{
-}
-
-#navcontainer ul ul ul ul a:hover{
-
-}
-
-/* Child Level 4 */
-
-#navcontainer ul ul ul ul {
-
-}
-
-#navcontainer ul ul ul ul ul li {
-	padding-left: 20px;
-}
-
-#navcontainer ul ul ul ul ul a{
-}
-
-#navcontainer ul ul ul ul ul a:hover{
-
-}
-
-/* Child Level 5 */
-
-#navcontainer ul ul ul ul ul {
-
-}
-
-#navcontainer ul ul ul ul ul ul li { 
-}
-
-#navcontainer ul ul ul ul ul ul a{
-}
-
-#navcontainer ul ul ul ul ul ul a:hover{
-
-}
-
-/*</group>*/
-
-/*<group=Global Classes>*/
-
-blockquote, .standout {
-	margin: 0;
-	padding: 5px;
-	font-weight: bold;
-}
-
-h1 {
-}
-
-h2 {
-}
-
-h3 {
-}
-
-h4 {
-}
-
-.imageStyle {
-
-}
-	
-/*</group>*/
-
-/*<group=Blog>*/
-
-/*<group=Archive Page>*/
-
-.blog-archive-background {
-}
.blog-archive-headings-wrapper {
-}
-
-.blog-archive-entries-wrapper {
-}
-
-.blog-archive-entries-wrapper .blog-entry {
-}
.blog-archive-month {
-}
-
-.blog-archive-link {
-}
.blog-archive-link a:link, .blog-archive-link a:visited {
-}
-	
-/*</group>*/
-
-.blog-entry {
-}
-
-.blog-entry-title {
-	font-weight: bold;
-	margin-bottom: 3px;
-}
-
-.blog-entry-date {
-	margin-bottom: 8px;
-	font-size: 0.9em;
-	color: #808080;
-}
-
-.blog-entry-body {
-	margin-bottom: 5px;
-	padding-bottom: 5px;
-	border-bottom: 1px solid #cccccc;
-}
-
-.blog-entry-comments {
-	display: none;
-}
-
-.blog-entry-category {
-}
-
-.blog-category-link-enabled {
-}
-
-.blog-category-link-disabled {
-}
-
-/*</group>*/
-
-/*<group=File Sharing>*/
-
-.filesharing-description {
-}
-
-.filesharing-item {
-	margin-bottom: 5px;
-	padding-bottom: 5px;
-	border-bottom: 1px solid #cccccc;
-}
-
-.filesharing-item-title a:link {
-}
-
-.filesharing-item-title a:hover {
-}
-
-.filesharing-item-title a:visited {
-
-}
-
-.filesharing-item-description {
-}
-
-/*</group>*/
-
-/*<group=Photo Album>*/
-
-/*<group=Index Page (Thumbnail view)>*/
-
-.album-title {
-	font-weight: bold;
-	margin-bottom: 3px;
-}
-
-.album-description {
-	margin-bottom: 8px;
-	font-size: 0.9em;
-	color: #808080;
-}
-
-table.thumbnail-table {
-	width: 99%;
-}
-
-table.thumbnail-table, table.thumbnail-table tr, table.thumbnail-table td {
-	display: block;
-}
-
-.thumbnail-frame {
-}
-
-.thumbnail-frame:hover {
-}
-
-.thumbnail-frame a {
-}
-
-.thumbnail-frame a:hover {
-}
-
-.thumbnail-frame img {
-}
-
-.thumbnail-caption {
-}
-	
-/*</group>*/
-
-/*<group=Single Page (Photo view)>*/
-
-.photo-background {
-}
-
-.photo-navigation {
-}
-
-.photo-links {
-}
-
-.photo-navigation a:link, .photo-navigation a:visited {
-
-}
-
-.photo-navigation a:hover {
-
-}
-
-.photo-frame{
-}
-
-.photo-title {
-}
-
-.photo-caption {
-}
-
-/*</group>*/
-	
-/*</group>*/
-
-/*<group=Quicktime Page>*/
-
-.movie-description {
-
-}
-	
-/*</group>*/
-
-/*<group=Quicktime Album>*/
-
-/*<group=Index Page (Movie Thumbnail view)>*/
-
-.movie-page-title {
-	font-weight: bold;
-	margin-bottom: 3px;
-}
.movie-page-description {
-	margin-bottom: 8px;
-	font-size: 0.9em;
-	color: #808080;
-}
.movie-thumbnail-frame {
-}
-
-.movie-thumbnail-frame:hover {
-}
-
-.movie-thumbnail-caption {
-}
-	
-/*</group>*/
-
-/*<group=Single Page (Movie View)>*/
-
-.movie-background {
-}
-
-.movie-title {
-}
-
-.movie-frame {
-
-}
-	
-/*</group>*/
-
-
-/*</group>*/
-
-/*<group=Contact Form>*/
-.message-text { 
-} 
-
-.required-text {
-} 
-
-.form-input-field {
-	max-width: 100%;
-} 
-
-.form-input-button { 
-} 
-/*</group>*/
-
-

resources/etc/SankoreEditor/editor_fr/index.html

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!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" />
-		<meta name="generator" content="RapidWeaver" />
-		
-		<title>Editeur</title>
-		<link rel="stylesheet" type="text/css" media="screen" href="rw_common/themes/caribou/styles.css" />
-		<!--[if IE 6]><link rel="stylesheet" type="text/css" media="screen" href="rw_common/themes/caribou/css/ie6.css" /><![endif]-->
-		<link rel="stylesheet" type="text/css" media="screen" href="rw_common/themes/caribou/colourtag-theme-default.css" />
-		<link rel="stylesheet" type="text/css" media="print" href="rw_common/themes/caribou/print.css" />
-		<link rel="stylesheet" type="text/css" media="handheld" href="rw_common/themes/caribou/handheld.css" />
-		<!--[if IE]><style type="text/css" media="screen">body {behavior: url(rw_common/themes/caribou/csshover.htc);}</style><![endif]-->
-		<link rel="stylesheet" type="text/css" media="screen" href="rw_common/themes/caribou/css/banner/swirls.css" />
-		<link rel="stylesheet" type="text/css" media="screen" href="rw_common/themes/caribou/css/logo_position/center.css" />
-		<link rel="stylesheet" type="text/css" media="screen" href="rw_common/themes/caribou/css/sidebar/sidebar_right.css" />
-		<link rel="stylesheet" type="text/css" media="screen" href="rw_common/themes/caribou/css/icons/black.css" />
-		
-		
-		<script type="text/javascript" src="rw_common/themes/caribou/javascript.js"></script>
-		
-		
-		
-		
-		<script type="text/javascript" charset="utf-8">	var blankSrc = "rw_common/themes/caribou/png/blank.gif";</script>	
-		<style type="text/css">	img { behavior:	url("rw_common/themes/caribou/png/pngbehavior.htc"); }</style>
-	</head>
-	
-	<!-- This page was created with RapidWeaver from Realmac Software. http://www.realmacsoftware.com -->
+<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>
-<div id="bar"></div>
-<div id="container"><!-- Start container -->
-	<div id="pageHeader"><!-- Start page header -->
-		<div id="navcontainer"><!-- Start Navigation -->
-			<ul><li><a href="index.html" rel="self" id="current">Editeur</a></li></ul>
-		</div><!-- End navigation --> 
-		<div id="title">
-			<div id="logo"></div>
-			<h1>Editeur Sankor&eacute;</h1>
-			<h2>Instructions pour l'utilisation de l'&eacute;diteur Sankor&eacute;</h2>
-			<div id="overlay_swirls"><img src="rw_common/themes/caribou/images/header_swirls.png" alt="" style="width: 900px; height: 150px;" /></div>
-			<div id="overlay_stripes_glow"><img src="rw_common/themes/caribou/images/header_stripes_glow.png" alt="" style="width: 900px; height: 150px;" /></div>
-			<div id="overlay_stripes_solid"><img src="rw_common/themes/caribou/images/header_stripes_solid.png" alt="" style="width: 900px; height: 150px;" /></div>
-			<div id="overlay_curve_solid"><img src="rw_common/themes/caribou/images/header_curve_solid.png" alt="" style="width: 900px; height: 150px;" /></div>
-		</div>
-		<div id="background"><img src="rw_common/themes/caribou/images/header_bg.png" alt="" style="width: 914px; height: 197px;" /></div>
-	</div><!-- End page header -->
-	
-	<div id="contentContainer"><!-- Start main content wrapper -->
-		<div id="content"><!-- Start content -->
-			<div class="contentSpacer"></div><!-- this makes sure the content is long enough for the design -->
-			<p style="text-align:center;"><br /><br /><br /></p><p style="text-align:left;"><span style="font:14px Trebuchet, Verdana, serif; font-weight:bold; font-weight:bold; ">L&rsquo;&eacute;diteur Sankor&eacute; vous permet de r&eacute;aliser des sc&eacute;narios d&rsquo;interactivit&eacute;s riches</span><span style="font:12px Trebuchet, Verdana, serif; "><br /><br /></span><span style="font:11px Trebuchet, Verdana, serif; ">ATTENTION : Vous devez &ecirc;tre connect&eacute; &agrave; l&rsquo;Internet pour l&rsquo;utiliser.</span><span style="font:12px Trebuchet, Verdana, serif; "><br /><br /></span><span style="font:13px Trebuchet, Verdana, serif; ">Quand vous entrez sur l&rsquo;&eacute;diteur, un nom d&rsquo;utilisateur et mot de passe vous sont demand&eacute;s.<br /><br />Pour le tester et l&rsquo;utiliser en mode de d&eacute;monstration, utilisez, comme indiqu&eacute; ci-dessous, l&rsquo;identifiant &ldquo;demo&rdquo; autant pour le nom d&rsquo;utilisateur que pour le mot de passe.<br /></span><span style="font:12px Trebuchet, Verdana, serif; "><br /></span></p><p style="text-align:center;"><img class="imageStyle" alt="login_paraschool" src="files/login_paraschool.png" width="371" height="252" /><span style="font:12px Trebuchet, Verdana, serif; "><br /></span></p><p style="text-align:left;"><span style="font:12px Trebuchet, Verdana, serif; "><br /></span><span style="font:13px Trebuchet, Verdana, serif; ">Si vous d&eacute;sirez l&rsquo;utiliser en tant qu&rsquo;outil personnel de cr&eacute;ation de contenus, vous pouvez envoyer un email &agrave; </span><span style="font:13px Trebuchet, Verdana, serif; "><a href="mailto:daniel.lebret@gmail.com" rel="self">cette adresse</a></span><span style="font:13px Trebuchet, Verdana, serif; "> en pr&eacute;cisant bien que vous d&eacute;sirez cr&eacute;er un compte sur l&rsquo;&eacute;diteur Sankor&eacute;.<br /><br /></span></p><p style="text-align:center;"><span style="font:13px Trebuchet, Verdana, serif; "><a href="http://editeur.sankore.org" rel="self">Cliquez ici pour vous connecter &agrave; l&rsquo;&eacute;diteur Sankor&eacute;<br /></a></span><a href="http://editeur.sankore.org" rel="self"><img class="imageStyle" alt="connect_screen" src="files/connect_screen.png" width="303" height="75" /></a></p>
-			<div class="clearer"></div>
-		</div><!-- End content -->
-		
-	</div><!-- End main content wrapper -->
-	
-	<div id="sidebarContainer"><!-- Start Sidebar wrapper -->
-		<div id="sidebar"><!-- Start sidebar content -->
-		<div class="sideHeader"></div><!-- Sidebar header --> 
-			<!-- sidebar content you enter in the page inspector -->
-			 <!-- sidebar content such as the blog archive links -->
-		</div><!-- End sidebar content -->
-	</div><!-- End sidebar wrapper -->
-	
-	<div class="clearer"></div>
-	
-</div><!-- End container -->
-
-<div class="clearer"></div>
-<div id="footer"><!-- Start Footer -->
-	<p></p>
-	<div id="breadcrumbcontainer"><!-- Start the breadcrumb wrapper -->
-		
-	</div><!-- End breadcrumb -->
-</div><!-- End Footer -->
+<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>

resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/css/ie6.css

-#navcontainer a {
-	padding: 15px 15px 17px 15px;
-	height: 0px;
-}
\ No newline at end of file

resources/etc/SankoreEditor/editor_fr/rw_common/themes/caribou/csshover.htc

-<attach event="ondocumentready" handler="parseStylesheets" />
-<script>
-/**
- *	Whatever:hover - V2.01.050927 - hover, active & focus
- *	------------------------------------------------------------
- *	(c) 2005 - Peter Nederlof
- *	Peterned - http://www.xs4all.nl/~peterned/
- *	License  - http://creativecommons.org/licenses/LGPL/2.1/
- *
- *	Whatever:hover is free software; you can redistribute it and/or
- *	modify it under the terms of the GNU Lesser General Public
- *	License as published by the Free Software Foundation; either
- *	version 2.1 of the License, or (at your option) any later version.
- *
- *	Whatever:hover is distributed in the hope that it will be useful,
- *	but WITHOUT ANY WARRANTY; without even the implied warranty of
- *	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- *	Lesser General Public License for more details.
- *
- *	Credits and thanks to:
- *	Arnoud Berendsen, Martin Reurings, Robert Hanson
- *
- *	howto: body { behavior:url("csshover.htc"); }
- *	------------------------------------------------------------
- */
-
-var csshoverReg = /(^|\s)((([^a]([^ ]+)?)|(a([^#.][^ ]+)+)):(hover|active))|((a|input|textarea):unknown)/i,
-currentSheet, doc = window.document, hoverEvents = [], activators = {
-	onhover:{on:'onmouseover', off:'onmouseout'},
-	onactive:{on:'onmousedown', off:'onmouseup'},
-	onunknown:{on:'onfocus', off:'onblur'}
-}
-
-function parseStylesheets() {
-	if(!/MSIE (5|6)/.test(navigator.userAgent)) return;
-	window.attachEvent('onunload', unhookHoverEvents);
-	var sheets = doc.styleSheets, l = sheets.length;
-	for(var i=0; i<l; i++) 
-		parseStylesheet(sheets[i]);
-}
-	function parseStylesheet(sheet) {
-		if(sheet.imports) {
-			try {
-				var imports = sheet.imports, l = imports.length;
-				for(var i=0; i<l; i++) parseStylesheet(sheet.imports[i]);
-			} catch(securityException){}
-		}
-
-		try {
-			var rules = (currentSheet = sheet).rules, l = rules.length;
-			for(var j=0; j<l; j++) parseCSSRule(rules[j]);
-		} catch(securityException){}
-	}
-
-	function parseCSSRule(rule) {
-		var select = rule.selectorText, style = rule.style.cssText;
-		if(!csshoverReg.test(select) || !style) return;
-		
-		var pseudo = select.replace(/[^:]+:([a-z-]+).*/i, 'on$1');
-		var newSelect = select.replace(/(\.([a-z0-9_-]+):[a-z]+)|(:[a-z]+)/gi, '.$2' + pseudo);
-		var className = (/\.([a-z0-9_-]*on(hover|active|unknown))/i).exec(newSelect)[1];
-		var affected = select.replace(/:(hover|active|unknown).*$/, '');
-		var elements = getElementsBySelect(affected);
-		if(elements.length == 0) return;
-
-		currentSheet.addRule(newSelect, style);
-		for(var i=0; i<elements.length; i++)
-			new HoverElement(elements[i], className, activators[pseudo]);
-	}
-
-function HoverElement(node, className, events) {
-	if(!node.hovers) node.hovers = {};
-	if(node.hovers[className]) return;
-	node.hovers[className] = true;
-	hookHoverEvent(node, events.on, function() { node.className += ' ' + className; });
-	hookHoverEvent(node, events.off, function() { node.className = node.className.replace(new RegExp('\\s+'+className, 'g'),''); });
-}
-	function hookHoverEvent(node, type, handler) {
-		node.attachEvent(type, handler);
-		hoverEvents[hoverEvents.length] = { 
-			node:node, type:type, handler:handler 
-		};
-	}
-
-	function unhookHoverEvents() {
-		for(var e,i=0; i<hoverEvents.length; i++) {
-			e = hoverEvents[i]; 
-			e.node.detachEvent(e.type, e.handler);
-		}
-	}
-
-function getElementsBySelect(rule) {
-	var parts, nodes = [doc];
-	parts = rule.split(' ');
-	for(var i=0; i<parts.length; i++) {
-		nodes = getSelectedNodes(parts[i], nodes);
-	}	return nodes;
-}
-	function getSelectedNodes(select, elements) {
-		var result, node, nodes = [];
-		var identify = (/\#([a-z0-9_-]+)/i).exec(select);
-		if(identify) return [doc.getElementById(identify[1])];
-		
-		var classname = (/\.([a-z0-9_-]+)/i).exec(select);
-		var tagName = select.replace(/(\.|\#|\:)[a-z0-9_-]+/i, '');
-		var classReg = classname? new RegExp('\\b' + classname[1] + '\\b'):false;
-		for(var i=0; i<elements.length; i++) {
-			result = tagName? elements[i].all.tags(tagName):elements[i].all; 
-			for(var j=0; j<result.length; j++) {
-				node = result[j];
-				if(classReg && !classReg.test(node.className)) continue;
-				nodes[nodes.length] = node;
-			}
-		}	return nodes;
-	}
-</script>
\ No newline at end of file

resources/forms/mainWindow.ui

@@ -71,7 +71,6 @@
    <addaction name="actionErase"/>
    <addaction name="actionGroupItems"/>
    <addaction name="actionBoard"/>
-   <addaction name="actionTutorial"/>
    <addaction name="actionWeb"/>
    <addaction name="actionDocument"/>
    <addaction name="actionDesktop"/>
@@ -117,7 +116,6 @@
    <addaction name="actionWebSmaller"/>
    <addaction name="separator"/>
    <addaction name="actionBoard"/>
-   <addaction name="actionTutorial"/>
    <addaction name="actionWeb"/>
    <addaction name="actionDocument"/>
    <addaction name="actionDesktop"/>
@@ -167,7 +165,6 @@
    <addaction name="actionAddToWorkingDocument"/>
    <addaction name="actionDocumentAdd"/>
    <addaction name="actionBoard"/>
-   <addaction name="actionTutorial"/>
    <addaction name="actionWeb"/>
    <addaction name="actionDocument"/>
    <addaction name="actionDesktop"/>
@@ -1640,7 +1637,8 @@
    </property>
    <property name="icon">
     <iconset resource="../sankore.qrc">
-     <normaloff>:/images/toolbar/library.png</normaloff>:/images/toolbar/library.png</iconset>
+     <normaloff>:/images/toolbar/group.png</normaloff>
+     <normalon>:/images/toolbar/ungroup.png</normalon>:/images/toolbar/group.png</iconset>
    </property>
    <property name="text">
     <string>Group Items</string>
@@ -1649,6 +1647,34 @@
     <string>Group items</string>
    </property>
   </action>
+  <action name="actionPlay">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="icon">
+    <iconset resource="../sankore.qrc">
+     <normaloff>:/images/stylusPalette/handPlay.png</normaloff>
+     <normalon>:/images/stylusPalette/handPlayOn.png</normalon>:/images/stylusPalette/handPlay.png</iconset>
+   </property>
+   <property name="text">
+    <string>Play</string>
+   </property>
+   <property name="toolTip">
+    <string>Interact with items</string>
+   </property>
+  </action>
+  <action name="actionEraseBackground">
+   <property name="icon">
+    <iconset resource="../sankore.qrc">
+     <normaloff>:/images/erasePalette/eraseBackground.svg</normaloff>:/images/erasePalette/eraseBackground.svg</iconset>
+   </property>
+   <property name="text">
+    <string>Erase Background</string>
+   </property>
+   <property name="toolTip">
+    <string>Remove the backgound</string>
+   </property>
+  </action>
  </widget>
  <resources>
   <include location="../sankore.qrc"/>

resources/images/duplicateDisabled.svg

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   width="26px"
+   height="26px"
+   viewBox="0 0 26 26"
+   style="enable-background:new 0 0 26 26;"
+   xml:space="preserve"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="duplicateDisabled.svg"><metadata
+   id="metadata21"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs19" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1283"
+   inkscape:window-height="762"
+   id="namedview17"
+   showgrid="false"
+   inkscape:zoom="9.0769231"
+   inkscape:cx="13"
+   inkscape:cy="13"
+   inkscape:window-x="65"
+   inkscape:window-y="24"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1" />
+
+<circle
+   style="fill:#CCCCCC;opacity:0.5"
+   cx="13"
+   cy="13"
+   r="13"
+   id="circle3" />
+<circle
+   style="fill:#999999;opacity:0.5"
+   cx="13"
+   cy="13"
+   r="11"
+   id="circle5" />
+<rect
+   x="5"
+   y="6"
+   style="fill:#F2F2F2;opacity:0.5"
+   width="12"
+   height="10"
+   id="rect7" />
+<rect
+   x="8"
+   y="9"
+   style="fill:#999999;opacity:0.5"
+   width="12"
+   height="10"
+   id="rect9" />
+<rect
+   x="7"
+   y="8"
+   style="fill:#999999;opacity:0.5"
+   width="8"
+   height="6"
+   id="rect11" />
+<rect
+   x="9"
+   y="10"
+   style="fill:#FFFFFF;opacity:0.5"
+   width="12"
+   height="10"
+   id="rect13" />
+<path
+   style="fill:#FFA600;opacity:0.5"
+   d="M10,7c0,0,2,0,4,0s3,1,3,3s0,3,0,3h3l-5,5l-5-5h3c0,0,0-1,0-2s0-2-1-2C10.5,9,10,7,10,7z"
+   id="path15" />
+</svg>
\ No newline at end of file

resources/images/erasePalette/eraseBackground.svg

+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->
+<!DOCTYPE svg [
+	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.2" baseProfile="tiny"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+	 x="0px" y="0px" width="128px" height="128px" viewBox="-7.587 -21.627 128 128" overflow="visible" xml:space="preserve">
+<defs>
+</defs>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="55.8784" y1="11.0928" x2="55.8784" y2="58.3739">
+	<stop  offset="0" style="stop-color:#FCFCFC"/>
+	<stop  offset="1" style="stop-color:#DCDCDC"/>
+</linearGradient>
+<path fill="url(#SVGID_1_)" d="M47.254,29.812c15.881,0.814,41.542,8.928,61.864,32.165V13.994c0-6.261-5.094-11.354-11.357-11.354
+	H13.993C7.733,2.64,2.64,7.734,2.64,13.994v27.544C17.206,34.21,32.229,29.042,47.254,29.812z"/>
+<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="49.7065" y1="34.9453" x2="49.7065" y2="82.9507">
+	<stop  offset="0" style="stop-color:#FCFCFC"/>
+	<stop  offset="1" style="stop-color:#DCDCDC"/>
+</linearGradient>
+<path fill="url(#SVGID_2_)" d="M2.64,50.422v19.419c0,6.26,5.094,11.356,11.354,11.356h82.781
+	C82.723,68.016,51.243,45.693,2.64,50.422z"/>
+<path fill="#FFFFFF" d="M5.28,40.236V13.995c0-4.805,3.908-8.715,8.715-8.715H97.76c4.807,0,8.717,3.91,8.717,8.715v45.077
+	c1.801,1.904,3.561,3.928,5.281,6.059V13.995C111.758,6.279,105.479,0,97.76,0H13.995C6.278,0,0,6.279,0,13.995v28.896
+	C1.753,41.976,3.514,41.088,5.28,40.236z"/>
+<path fill="#FFFFFF" d="M93.854,78.558H13.995c-4.805,0-8.715-3.91-8.715-8.719V50.195C3.543,50.332,1.782,50.504,0,50.711v19.128
+	c0,7.721,6.278,13.998,13.995,13.998H97.76c0.551,0,1.092-0.04,1.625-0.103C97.844,82.182,96.002,80.43,93.854,78.558z"/>
+<path fill="#B0B9C4" d="M3.521,41.098V13.995c0-5.776,4.698-10.475,10.475-10.475H97.76c5.777,0,10.477,4.7,10.479,10.475V61
+	c1.191,1.326,2.365,2.701,3.52,4.131V13.995C111.758,6.279,105.479,0,97.76,0H13.995C6.278,0,0,6.279,0,13.995v28.896
+	C1.171,42.28,2.344,41.682,3.521,41.098z"/>
+<path fill="#B0B9C4" d="M95.825,80.318h-81.83c-5.776,0-10.475-4.702-10.475-10.479V50.347C2.356,50.453,1.184,50.573,0,50.711
+	v19.128c0,7.721,6.278,13.998,13.995,13.998H97.76c0.551,0,1.092-0.04,1.625-0.103C98.338,82.68,97.151,81.533,95.825,80.318z"/>
+<path fill="#FFFFFF" d="M62.442,59.005H56.76v-2.218c-0.219-0.078-0.438-0.156-0.659-0.234v2.452H40.04v-6.86
+	c-0.221-0.044-0.438-0.09-0.66-0.133v6.993H22.44v-9.052c-0.221-0.012-0.438-0.027-0.66-0.038v9.09H9.68v0.66H21.78v18.26h0.66
+	v-18.26H39.38v18.26h0.66v-18.26h16.061v18.26h0.659v-18.26h7.221C63.473,59.442,62.959,59.223,62.442,59.005z"/>
+<path fill="#FFFFFF" d="M90.86,76.037v1.888h0.658v-1.349C91.301,76.396,91.083,76.217,90.86,76.037z"/>
+<path fill="#FFFFFF" d="M21.78,33.54c0.22-0.07,0.44-0.135,0.66-0.204v-7.991H39.38v4.593c0.22-0.018,0.44-0.038,0.66-0.053v-4.54
+	h16.061v5.557c0.219,0.041,0.438,0.082,0.659,0.125v-5.682H73.7v10.901c0.221,0.092,0.439,0.188,0.66,0.283V25.345h16.5v16.94
+	h-5.262c0.369,0.221,0.736,0.433,1.105,0.66h4.156v2.726c0.221,0.151,0.439,0.296,0.658,0.449v-3.175h11.662v-0.66H91.518v-16.94
+	h11.662v-0.66H91.518V7.745H90.86v16.94h-16.5V7.745H73.7v16.94H56.76V7.745h-0.659v16.94H40.04V7.745h-0.66v16.94H22.44V7.745
+	h-0.66v16.94H9.68v0.66H21.78V33.54z"/>
+<path fill="#FFFFFF" d="M73.7,64.463v13.462h0.66V64.832C74.141,64.709,73.922,64.585,73.7,64.463z"/>
+<image width="48" height="39" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADEAAAAoCAYAAABXRRJPAAAACXBIWXMAAAsSAAALEgHS3X78AAAA
+GXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAQVJREFUeNrU2DEOwyAMBdAQlow9
+Qu9/qh4hI2NlyUg0wiWAY/y/ZCGxPdleHDb7vLhyTq7hhAWAt4AYxsTFAMrBfwcXJXlESAAVTHQC
+mMIEZ4Bayl2p7k1wDpBAP5gIBBBHLQIBJEzaAQGPLrY1gHbiQ29AB2h1YilAA7EcMItwAZhBuAGM
+IlwBRhDuAL0Il4AehFvAXYRrwB2Ee0ALAQH4h4ABSAgoAGUXEDCAGgIOcB0nyzFSA5QIWEBGQAOk
+xYYCUOhkk4rK5xAYQEZsDDj5PZQhjwJKxFZgNLvyOKCGuHZlBmMCkBAaGDNACzGKMQXcRfRgzAG9
+iBZmCUArSy7hZb4CDAA3l4ZOlZxXfQAAAABJRU5ErkJggg==" transform="matrix(1 0 0 1 63.3794 58.4092)">
+</image>
+<polygon fill="#FFA6E0" points="92.106,73.745 92.106,83.985 110.586,64.945 92.106,57.024 87.926,57.024 78.034,66.296 "/>
+<polygon fill="#24ABFF" points="93.352,82.618 93.938,73.673 78.034,66.296 67.465,76.386 63.506,86.578 80.667,95.525 "/>
+<path fill="#7ACCFF" d="M63.506,86.578l0.006-0.015l3.953-10.178c0,0,12.32,6.016,14.227,7.188c0,0,0.441,0.365,0.367,0.732
+	c-0.395,1.963-1.393,11.22-1.393,11.22L63.506,86.578z"/>
+<polygon fill="#2096E0" points="80.667,95.525 82.133,83.793 93.352,73.306 93.352,82.618 "/>
+<polygon fill="#FFD6F1" points="87.926,57.024 102.885,63.845 110.586,64.945 92.106,57.024 "/>
+<polygon fill="#ED82C8" points="93.352,82.618 93.278,73.38 103.032,64.065 110.586,64.945 "/>
+</svg>