Merge branch 'develop' into shiba-dev

12 years ago · 250951d517
parent 3fb1e75c6b 1b3a3a6135
commit 250951d517
210 changed files with 145 additions and 98 deletions
--- a/JournalDesModifications.pdf
+++ b/JournalDesModifications.pdf
--- a/ReleaseNotes.pdf
+++ b/ReleaseNotes.pdf
--- a/Sankore_3.1.pro
+++ b/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 = 04
+VERSION_PATCH = 05

 VERSION = "$${VERSION_MAJ}.$${VERSION_MIN}.$${VERSION_TYPE}.$${VERSION_PATCH}"
 VERSION = $$replace(VERSION, "\\.r", "")
--- a/resources/library/interactivities/Balance.wgt/config.xml
+++ b/resources/library/interactivities/Balance.wgt/config.xml
--- a/resources/library/interactivities/Balance.wgt/css/fonts/Lobster/Lobster_1.3-webfont.eot
+++ b/resources/library/interactivities/Balance.wgt/css/fonts/Lobster/Lobster_1.3-webfont.eot
--- a/resources/library/interactivities/Balance.wgt/css/fonts/Lobster/Lobster_1.3-webfont.svg
+++ b/resources/library/interactivities/Balance.wgt/css/fonts/Lobster/Lobster_1.3-webfont.svg
--- a/resources/library/interactivities/Balance.wgt/css/fonts/Lobster/Lobster_1.3-webfont.ttf
+++ b/resources/library/interactivities/Balance.wgt/css/fonts/Lobster/Lobster_1.3-webfont.ttf
--- a/resources/library/interactivities/Balance.wgt/css/fonts/Lobster/Lobster_1.3-webfont.woff
+++ b/resources/library/interactivities/Balance.wgt/css/fonts/Lobster/Lobster_1.3-webfont.woff
--- a/resources/library/interactivities/Balance.wgt/css/fonts/Lobster/demo.html
+++ b/resources/library/interactivities/Balance.wgt/css/fonts/Lobster/demo.html
--- a/resources/library/interactivities/Balance.wgt/css/fonts/Lobster/stylesheet.css
+++ b/resources/library/interactivities/Balance.wgt/css/fonts/Lobster/stylesheet.css
--- a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.eot
+++ b/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.eot
--- a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.svg
+++ b/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.svg
--- a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.ttf
+++ b/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.ttf
--- a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.woff
+++ b/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.woff
--- a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.eot
+++ b/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.eot
--- a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.svg
+++ b/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.svg
--- a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.ttf
+++ b/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.ttf
--- a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.woff
+++ b/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.woff
--- a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.eot
+++ b/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.eot
--- a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.svg
+++ b/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.svg
--- a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.ttf
+++ b/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.ttf
--- a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.woff
+++ b/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.woff
--- a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.eot
+++ b/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.eot
--- a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.svg
+++ b/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.svg
--- a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.ttf
+++ b/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.ttf
--- a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.woff
+++ b/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.woff
--- a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.eot
+++ b/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.eot
--- a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.svg
+++ b/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.svg
--- a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.ttf
+++ b/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.ttf
--- a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.woff
+++ b/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.woff
--- a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.eot
+++ b/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.eot
--- a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.svg
+++ b/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.svg
--- a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.ttf
+++ b/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.ttf
--- a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.woff
+++ b/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.woff
--- a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/demo.html
+++ b/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/demo.html
--- a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/stylesheet.css
+++ b/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/stylesheet.css
--- a/resources/library/interactivities/Balance.wgt/css/images/balance.png
+++ b/resources/library/interactivities/Balance.wgt/css/images/balance.png
--- a/resources/library/interactivities/Balance.wgt/css/images/bg.png
+++ b/resources/library/interactivities/Balance.wgt/css/images/bg.png
--- a/resources/library/interactivities/Balance.wgt/css/images/delete.png
+++ b/resources/library/interactivities/Balance.wgt/css/images/delete.png
--- a/resources/library/interactivities/Balance.wgt/css/images/graduations.png
+++ b/resources/library/interactivities/Balance.wgt/css/images/graduations.png
--- a/resources/library/interactivities/Balance.wgt/css/images/pad-bd.png
+++ b/resources/library/interactivities/Balance.wgt/css/images/pad-bd.png
--- a/resources/library/interactivities/Balance.wgt/css/images/parameters-bg.png
+++ b/resources/library/interactivities/Balance.wgt/css/images/parameters-bg.png
--- a/resources/library/interactivities/Balance.wgt/css/images/pivot.png
+++ b/resources/library/interactivities/Balance.wgt/css/images/pivot.png
--- a/resources/library/interactivities/Balance.wgt/css/images/scale.png
+++ b/resources/library/interactivities/Balance.wgt/css/images/scale.png
--- a/resources/library/interactivities/Balance.wgt/css/images/scales.png
+++ b/resources/library/interactivities/Balance.wgt/css/images/scales.png
--- a/resources/library/interactivities/Balance.wgt/css/images/slate-bd.png
+++ b/resources/library/interactivities/Balance.wgt/css/images/slate-bd.png
--- a/resources/library/interactivities/Balance.wgt/css/images/slate-toolbar-edit.png
+++ b/resources/library/interactivities/Balance.wgt/css/images/slate-toolbar-edit.png
--- a/resources/library/interactivities/Balance.wgt/css/images/slate-toolbar-help.png
+++ b/resources/library/interactivities/Balance.wgt/css/images/slate-toolbar-help.png
--- a/resources/library/interactivities/Balance.wgt/css/images/slate-toolbar-reload.png
+++ b/resources/library/interactivities/Balance.wgt/css/images/slate-toolbar-reload.png
--- a/resources/library/interactivities/Balance.wgt/css/images/toolbar-edit.png
+++ b/resources/library/interactivities/Balance.wgt/css/images/toolbar-edit.png
--- a/resources/library/interactivities/Balance.wgt/css/images/toolbar-help.png
+++ b/resources/library/interactivities/Balance.wgt/css/images/toolbar-help.png
--- a/resources/library/interactivities/Balance.wgt/css/images/toolbar-reload.png
+++ b/resources/library/interactivities/Balance.wgt/css/images/toolbar-reload.png
--- a/resources/library/interactivities/Balance.wgt/css/images/weight-add.png
+++ b/resources/library/interactivities/Balance.wgt/css/images/weight-add.png
--- a/resources/library/interactivities/Balance.wgt/css/images/weight.png
+++ b/resources/library/interactivities/Balance.wgt/css/images/weight.png
--- a/resources/library/interactivities/Balance.wgt/css/main.css
+++ b/resources/library/interactivities/Balance.wgt/css/main.css
--- a/resources/library/interactivities/Balance.wgt/css/ubw-help.css
+++ b/resources/library/interactivities/Balance.wgt/css/ubw-help.css
--- a/resources/library/interactivities/Balance.wgt/css/ubw-main.css
+++ b/resources/library/interactivities/Balance.wgt/css/ubw-main.css
--- a/resources/library/interactivities/Balance.wgt/help.html
+++ b/resources/library/interactivities/Balance.wgt/help.html
--- a/resources/library/interactivities/Balance.wgt/i18n/Messages.properties
+++ b/resources/library/interactivities/Balance.wgt/i18n/Messages.properties
--- a/resources/library/interactivities/Balance.wgt/i18n/Messages_fr.properties
+++ b/resources/library/interactivities/Balance.wgt/i18n/Messages_fr.properties
--- a/resources/library/interactivities/Balance.wgt/icon.png
+++ b/resources/library/interactivities/Balance.wgt/icon.png
--- a/resources/library/interactivities/Balance.wgt/index.html
+++ b/resources/library/interactivities/Balance.wgt/index.html
--- a/resources/library/interactivities/Balance.wgt/js/help-template.js
+++ b/resources/library/interactivities/Balance.wgt/js/help-template.js
--- a/resources/library/interactivities/Balance.wgt/js/help_fr-template.js
+++ b/resources/library/interactivities/Balance.wgt/js/help_fr-template.js
--- a/resources/library/interactivities/Balance.wgt/js/lib/jquery-1.7.1.min.js
+++ b/resources/library/interactivities/Balance.wgt/js/lib/jquery-1.7.1.min.js
--- a/resources/library/interactivities/Balance.wgt/js/lib/jquery-css-transform.js
+++ b/resources/library/interactivities/Balance.wgt/js/lib/jquery-css-transform.js
--- a/resources/library/interactivities/Balance.wgt/js/lib/jquery-ui-1.8.17.custom.min.js
+++ b/resources/library/interactivities/Balance.wgt/js/lib/jquery-ui-1.8.17.custom.min.js
--- a/resources/library/interactivities/Balance.wgt/js/lib/jquery.i18n.properties-min-1.0.9.js
+++ b/resources/library/interactivities/Balance.wgt/js/lib/jquery.i18n.properties-min-1.0.9.js
--- a/resources/library/interactivities/Balance.wgt/js/lib/modernizr.js
+++ b/resources/library/interactivities/Balance.wgt/js/lib/modernizr.js
--- a/resources/library/interactivities/Balance.wgt/js/lib/mustache.js
+++ b/resources/library/interactivities/Balance.wgt/js/lib/mustache.js
--- a/resources/library/interactivities/Balance.wgt/js/lib/ubw-main.js
+++ b/resources/library/interactivities/Balance.wgt/js/lib/ubw-main.js
--- a/resources/library/interactivities/Balance.wgt/js/main.js
+++ b/resources/library/interactivities/Balance.wgt/js/main.js
--- a/resources/library/interactivities/Balance.wgt/js/templates.js
+++ b/resources/library/interactivities/Balance.wgt/js/templates.js
--- a/resources/library/interactivities/Cadran.wgt/config.xml
+++ b/resources/library/interactivities/Cadran.wgt/config.xml
--- a/resources/library/interactivities/Cadran.wgt/css/fonts/Lobster/Lobster_1.3-webfont.eot
+++ b/resources/library/interactivities/Cadran.wgt/css/fonts/Lobster/Lobster_1.3-webfont.eot
--- a/resources/library/interactivities/Cadran.wgt/css/fonts/Lobster/Lobster_1.3-webfont.svg
+++ b/resources/library/interactivities/Cadran.wgt/css/fonts/Lobster/Lobster_1.3-webfont.svg
--- a/resources/library/interactivities/Cadran.wgt/css/fonts/Lobster/Lobster_1.3-webfont.ttf
+++ b/resources/library/interactivities/Cadran.wgt/css/fonts/Lobster/Lobster_1.3-webfont.ttf
--- a/resources/library/interactivities/Cadran.wgt/css/fonts/Lobster/Lobster_1.3-webfont.woff
+++ b/resources/library/interactivities/Cadran.wgt/css/fonts/Lobster/Lobster_1.3-webfont.woff
--- a/resources/library/interactivities/Cadran.wgt/css/fonts/Lobster/demo.html
+++ b/resources/library/interactivities/Cadran.wgt/css/fonts/Lobster/demo.html
--- a/resources/library/interactivities/Cadran.wgt/css/fonts/Lobster/stylesheet.css
+++ b/resources/library/interactivities/Cadran.wgt/css/fonts/Lobster/stylesheet.css
--- a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.eot
+++ b/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.eot
--- a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.svg
+++ b/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.svg
--- a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.ttf
+++ b/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.ttf
--- a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.woff
+++ b/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.woff
--- a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.eot
+++ b/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.eot
--- a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.svg
+++ b/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.svg
--- a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.ttf
+++ b/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.ttf
--- a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.woff
+++ b/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.woff
--- a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.eot
+++ b/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.eot
--- a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.svg
+++ b/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.svg
--- a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.ttf
+++ b/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.ttf
--- a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.woff
+++ b/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.woff
--- a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.eot
+++ b/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.eot
--- a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.svg
+++ b/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.svg
--- a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.ttf
+++ b/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.ttf
--- a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.woff
+++ b/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.woff
--- a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.eot
+++ b/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.eot
--- a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.svg
+++ b/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.svg
--- a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.ttf
+++ b/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.ttf
--- a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.woff
+++ b/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.woff
--- a/Show More
+++ b/Show More