Merge remote-tracking branch 'upstream/develop' into aristo_tool

Conflicts:
	resources/inDevelopmentWidgets/Balance.wgt/css/images/delete.png
	resources/inDevelopmentWidgets/Balance.wgt/css/images/graduations.png
	resources/inDevelopmentWidgets/Balance.wgt/css/images/pivot.png
	resources/inDevelopmentWidgets/Balance.wgt/css/images/scale.png
	resources/inDevelopmentWidgets/Balance.wgt/css/images/scales.png
	resources/inDevelopmentWidgets/Balance.wgt/css/images/weight-add.png
	resources/inDevelopmentWidgets/Balance.wgt/css/images/weight.png

.gitignore

@@ -70,3 +70,5 @@ plugins/cffadaptor/objects
 #####################
 *.qm
 
+
+.DS_Store
\ No newline at end of file

Sankore 3.1.iss

@@ -47,9 +47,6 @@ Type: files ; Name: "{app}\*.dll"
 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
-
 ;OpenSSL
 Source: "..\Sankore-ThirdParty\openssl\win32\libeay32.dll"; DestDir:"{app}"; Flags: ignoreversion
 Source: "..\Sankore-ThirdParty\openssl\win32\ssleay32.dll"; DestDir:"{app}"; Flags: ignoreversion
@@ -85,6 +82,15 @@ Source: "..\Qt-4.8\plugins\imageformats\qtiff4.dll"; DestDir: "{app}\imageformat
 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
 
+;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\playlistformats\qtmultimediakit_m3u.dll"; DestDir: "c:\OpenSankore\playlistformats"; Flags: ignoreversion
+Source: "c:\OpenSankore\plugins\playlistformats\qtmultimediakit_m3ud.dll"; DestDir: "c:\OpenSankore\playlistformats"; Flags: ignoreversion
+
 [Icons]
 Name: "{group}\Open-Sankor"; Filename: "{app}\Open-Sankore.exe"
 Name: "{group}\{cm:UninstallProgram,Open-Sankor}"; Filename: "{uninstallexe}"

resources/library/applications/Nuancier.wgt/css/layout.css

@@ -34,6 +34,8 @@ html, body {
 	font-size: 12px;
 	line-height: 18px;
 	color: #52697E;
+        width: 100%;
+        height: 100%;
 }
 body {
 	text-align: center;

resources/library/applications/Nuancier.wgt/index.html

@@ -4,7 +4,7 @@
         <link rel="stylesheet" href="css/colorpicker.css" type="text/css" />
         <link rel="stylesheet" media="screen" type="text/css" href="css/layout.css" />
         <title>ColorPicker - jQuery plugin</title>
-        <script type="text/javascript" src="js/jquery.js"></script>
+        <script type="text/javascript" src="js/jquery-1.8.1.min.js"></script>
         <script type="text/javascript" src="js/colorpicker.js"></script>
         <script type="text/javascript" src="js/eye.js"></script>
         <script type="text/javascript" src="js/utils.js"></script>

resources/library/applications/Nuancier.wgt/js/colorpicker.js

@@ -11,6 +11,10 @@
         var
         ids = {},
         penFlag = true,
+        tmpColor = {
+            a:"",
+            b:""
+        },
         inAction,
         charMin = 65,
         visible,
@@ -108,7 +112,10 @@
             }				
             setSelector(col, cal.get(0));
             setHue(col, cal.get(0));
-            setNewColor(col, cal.get(0));
+            //setNewColor(col, cal.get(0));
+            $(cal.get(0)).data('colorpicker').newColor.css('backgroundColor', '#' + HSBToHex(col));
+            tmpColor.a = cal.get(0);
+            tmpColor.b = col;
             cal.data('colorpicker').onChange.apply(cal, [col, HSBToHex(col), HSBToRGB(col)]);
         },
         blur = function (ev) {
@@ -182,6 +189,17 @@
             current.preview = current.cal.data('colorpicker').livePreview;            
             $(document).bind('mouseup', current, upSelector);
             $(document).bind('mousemove', current, moveSelector);
+            change.apply(
+                current.cal.data('colorpicker')
+                .fields
+                .eq(6)
+                .val(parseInt(100*(150 - Math.max(0,Math.min(150,(ev.pageY - current.pos.top))))/150, 10))
+                .end()
+                .eq(5)
+                .val(parseInt(100*(Math.max(0,Math.min(150,(ev.pageX - current.pos.left))))/150, 10))
+                .get(0),
+                [current.preview]
+                );
         },
         moveSelector = function (ev) {
             change.apply(
@@ -202,6 +220,18 @@
             fillHexFields(ev.data.cal.data('colorpicker').color, ev.data.cal.get(0));
             $(document).unbind('mouseup', upSelector);
             $(document).unbind('mousemove', moveSelector);
+            if(penFlag){
+                $("div.tools_change").removeClass("tools_compass");
+                window.sankore.setTool('pen');
+                window.sankore.setPenColor('#' + HSBToHex(tmpColor.b));
+                sankore.returnStatus("PEN installed", penFlag);
+            } else {
+                $("div.tools_change").addClass("tools_compass");
+                window.sankore.setTool('compass');
+                window.sankore.setPenColor('#' + HSBToHex(tmpColor.b));
+                sankore.returnStatus("Compass installed", penFlag);
+            }
+            //$(tmpColor.a).data('colorpicker').newColor.css('backgroundColor', '#' + HSBToHex(tmpColor.b));
             return false;
         },
         enterSubmit = function (ev) {
@@ -433,6 +463,9 @@
         HSBToHex = function (hsb) {
             return RGBToHex(HSBToRGB(hsb));
         },
+        //        changeCursor = function (flag) {
+        //            alert(flag)
+        //        },
         restoreOriginal = function () {
             var cal = $(this).parent();
             var col = cal.data('colorpicker').origColor;
@@ -446,6 +479,15 @@
         };
         return {
             init: function (opt) {
+                if(window.sankore)
+                    sankore.setTool("arrow");              
+                //                $(document).mouseout(function(event){
+                //                    if(event.target.tagName == "DIV" && event.target.className == "colorpicker")
+                //                        changeCursor(true)
+                //                })
+                //                $("body").mouseleave(function(){
+                //                    changeCursor(true)
+                //                })
                 opt = $.extend({}, defaults, opt||{});
                 if (typeof opt.color == 'string') {
                     opt.color = HexToHSB(opt.color);
@@ -465,9 +507,13 @@
                         var cal = $(tpl).attr('id', id);
                         if (options.flat) {
                             cal.appendTo(this).show();
-                        } else {
+                        }
+                        else {
                             cal.appendTo(document.body);
                         }
+                        //                        cal.bind("mouseover", function(){
+                        //                            window.sankore.setTool('arrow');
+                        //                        })
                         options.fields = cal
                         .find('input')
                         .bind('keyup', keyDown)

resources/library/interactivities/Ass images.wgt/locales/fr/js/script.js

@@ -9,7 +9,7 @@ var sankoreLang = {
     slate: "ardoise",
     pad: "tablette",
     none: "aucun",
-    help: "aide",
+    help: "Aide",
     help_content: "Ceci est un exemple de contenu de l'aide ..."
 };
 

resources/inDevelopmentWidgets/Balance.wgt/i18n/Messages_fr.properties → resources/library/interactivities/Balance.wgt/i18n/Messages_fr.properties

 fr.njin.i18n.document.title = La Balance
 
-fr.njin.i18n.toolbar.edit = Editer
-fr.njin.i18n.toolbar.view = Fermer
+fr.njin.i18n.toolbar.edit = Modifier
+fr.njin.i18n.toolbar.view = Afficher
 fr.njin.i18n.toolbar.reload = Recharger
 fr.njin.i18n.toolbar.help = Aide
 
-fr.njin.i18n.parameters.label.themes = Thème
+fr.njin.i18n.parameters.label.themes = Thèmes
 fr.njin.i18n.parameters.label.slate.themes = ardoise
 fr.njin.i18n.parameters.label.pad.themes = tablette
 fr.njin.i18n.parameters.label.none.themes = aucun