# HG changeset patch # User cavaliet # Date 1339000370 -7200 # Node ID fa256a9f8d05ca655c2bdb2304781aa8983514f0 # Parent 6cab7e0b16783c95cf730b89c36ebf70b5b1d0a8# Parent 84fc628397516cffec0bed937b250f8d776f51e1 Merge with 84fc628397516cffec0bed937b250f8d776f51e1 diff -r 6cab7e0b1678 -r fa256a9f8d05 crea/integration/img/record.png Binary file crea/integration/img/record.png has changed diff -r 6cab7e0b1678 -r fa256a9f8d05 crea/integration/metadataplayer/MusitagAnnotator.css --- a/crea/integration/metadataplayer/MusitagAnnotator.css Wed Jun 06 18:31:09 2012 +0200 +++ b/crea/integration/metadataplayer/MusitagAnnotator.css Wed Jun 06 18:32:50 2012 +0200 @@ -32,12 +32,8 @@ } .Musitag-Annotator-record { - width: 135px; height: 135px; background: url(../img/record.png); - margin: 35px 31px; cursor: pointer; -} - -.Musitag-Annotator-record:hover { - background-position: 0 -135px; + width: 220px; height: 160px; background: url(../img/record.png) rgba(0,0,128,.5) center no-repeat; + margin: 25px -12px; cursor: pointer; } .Musitag-Annotator-Note { diff -r 6cab7e0b1678 -r fa256a9f8d05 crea/integration/metadataplayer/MusitagAnnotator.js --- a/crea/integration/metadataplayer/MusitagAnnotator.js Wed Jun 06 18:31:09 2012 +0200 +++ b/crea/integration/metadataplayer/MusitagAnnotator.js Wed Jun 06 18:32:50 2012 +0200 @@ -78,7 +78,7 @@ + '
' + '
' + '
' - + ' ' + + '
' + '
' + ' ' + '' @@ -120,6 +120,9 @@ IriSP.Widgets.MusitagAnnotator.prototype.show = function() { this.$.show(); + this.$.find('.Musitag-Annotator-tagInSelector').removeClass("down"); + this.$.find(".Musitag-Annotator-tagInSend .Musitag-color").attr("class","Musitag-color"); + this.$.find(".Musitag-Annotator-tagInSend .Musitag-emoticon").attr("class","Musitag-emoticon hidden"); this.position_bar.slideDown(200); } diff -r 6cab7e0b1678 -r fa256a9f8d05 crea/micro/DOMDocument.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/crea/micro/DOMDocument.xml Wed Jun 06 18:32:50 2012 +0200 @@ -0,0 +1,335 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff -r 6cab7e0b1678 -r fa256a9f8d05 crea/micro/LIBRARY/Bouton Microphone.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/crea/micro/LIBRARY/Bouton Microphone.xml Wed Jun 06 18:32:50 2012 +0200 @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff -r 6cab7e0b1678 -r fa256a9f8d05 crea/micro/LIBRARY/fond.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/crea/micro/LIBRARY/fond.xml Wed Jun 06 18:32:50 2012 +0200 @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff -r 6cab7e0b1678 -r fa256a9f8d05 crea/micro/LIBRARY/micro.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/crea/micro/LIBRARY/micro.xml Wed Jun 06 18:32:50 2012 +0200 @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff -r 6cab7e0b1678 -r fa256a9f8d05 crea/micro/META-INF/metadata.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/crea/micro/META-INF/metadata.xml Wed Jun 06 18:32:50 2012 +0200 @@ -0,0 +1,55 @@ + + + + + Adobe Flash Professional CS5.5 - build 325 + 2012-06-06T16:27:33+02:00 + 2012-06-06T16:37:34+02:00 + 2012-06-06T16:37:34+02:00 + + + application/vnd.adobe.fla + + + xmp.iid:D5F97427E5AFE111A602EDDAE8808DB1 + xmp.did:D5F97427E5AFE111A602EDDAE8808DB1 + xmp.did:D5F97427E5AFE111A602EDDAE8808DB1 + + + + created + xmp.iid:D5F97427E5AFE111A602EDDAE8808DB1 + 2012-06-06T16:27:33+02:00 + Adobe Flash Professional CS5.5 - build 325 + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff -r 6cab7e0b1678 -r fa256a9f8d05 crea/micro/MobileSettings.xml diff -r 6cab7e0b1678 -r fa256a9f8d05 crea/micro/PublishSettings.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/crea/micro/PublishSettings.xml Wed Jun 06 18:32:50 2012 +0200 @@ -0,0 +1,205 @@ + + + + 1 + 1 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + Untitled-1.swf + Untitled-1.exe + Untitled-1.app + Untitled-1.html + Untitled-1.gif + Untitled-1.jpg + Untitled-1.png + Untitled-1.mov + Untitled-1.smil + Untitled-1.swc + + + 0 + 10,2,153,0;10,1,52,0;9,0,124,0;8,0,24,0;7,0,14,0;6,0,79,0;5,0,58,0;4,0,32,0;3,0,8,0;2,0,1,12;1,0,0,1; + 1 + 1 + Untitled-1_content.html + Untitled-1_alternate.html + 0 + + 140 + 140 + 0 + 0 + 1 + 0 + 0 + 1 + 1 + 4 + 0 + 0 + 1 + 0 + C:\Users\raph\AppData\Local\Adobe\Flash CS5.5\en_US\Configuration\HTML\Default.html + 1 + + + + + 0 + 0 + 0 + 80 + 0 + 0 + 7 + 0 + 7 + 0 + 10 + FlashPlayer10 + 3 + 1 + + . + CONFIG::FLASH_AUTHORING="true"; + 0 + + 1 + 1 + 0 + 0 + 0 + 0 + + 2 + 4 + 4096 + AS3 + 1 + 1 + 0 + 15 + 1 + 0 + 4102 + rsl + wrap + $(AppConfig)/ActionScript 3.0/rsls/loader_animation.swf + + + $(AppConfig)/ActionScript 3.0/libs + merge + + + $(AppConfig)/ActionScript 3.0/libs/11.0/textLayout.swc + rsl + http://fpdownload.adobe.com/pub/swz/tlf/2.0.0.232/textLayout_2.0.0.232.swz + http://fpdownload.adobe.com/pub/swz/crossdomain.xml + textLayout_2.0.0.232.swz + + + + + $(AppConfig)/ActionScript 3.0/libs/11.0/textLayout.swc + + http://fpdownload.adobe.com/pub/swz/tlf/2.0.0.232/textLayout_2.0.0.232.swz + http://fpdownload.adobe.com/pub/swz/crossdomain.xml + textLayout_2.0.0.232.swz + + + + + 140 + 140 + 0 + 4718592 + 0 + 80 + 1 + + + 1 + 0 + 1 + 0 + 0 + 100000 + 1 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + + + 140 + 140 + 0 + 1 + 1 + + 1 + 0 + 1 + 0 + 0 + + 128 + + + 255 + + + + 140 + 140 + 1 + 0 + 0 + 1 + 0 + 0 + 1 + + + + 24-bit with Alpha + 255 + + + + 140 + 140 + 1 + 0 + + + 00000000 + 0 + 0 + 0 + 0 + 1 + + + \ No newline at end of file diff -r 6cab7e0b1678 -r fa256a9f8d05 crea/micro/bin/SymDepend.cache Binary file crea/micro/bin/SymDepend.cache has changed diff -r 6cab7e0b1678 -r fa256a9f8d05 crea/micro/micro.xfl --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/crea/micro/micro.xfl Wed Jun 06 18:32:50 2012 +0200 @@ -0,0 +1,1 @@ +PROXY-CS5 \ No newline at end of file