Changeset 29898

Show
Ignore:
Timestamp:
19.05.2015 10:31:17 (4 years ago)
Author:
davidb
Message:

Graphics equalizer tidyup. Tooltips on Game On sections

Location:
main/trunk/model-sites-dev/respooled/collect/popup-video-respooled
Files:
5 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/model-sites-dev/respooled/collect/popup-video-respooled/js/game-on.js

    r29897 r29898  
    267267            var block_y_dim = midi_y_dim_spacing * (block_midi_range); 
    268268 
    269             var block_rect = goPaper.rect(block_x_org-1,block_y_org-1,block_x_dim+2,block_y_dim+2); // fudge factor! 
    270             block_rect.attr({"stroke":"none", "stroke-width":0, "fill":"rgba(46, 82, 164, 0.5)"}); 
    271             go_top_level_group.push(block_rect); 
     269            if (gs.xsltParams.interface_name != "respooled") { 
     270            var block_rect = goPaper.rect(block_x_org-1,block_y_org-1,block_x_dim+2,block_y_dim+2); // fudge factor! 
     271            block_rect.attr({"stroke":"none", "stroke-width":0, "fill":"rgba(46, 82, 164, 0.5)"}); 
     272             
     273            var block_tip = track_block.name; 
     274 
     275            if ("_computedKey" in track_block) { 
     276 
     277                var computedKey = track_block._computedKey; 
     278                var key = computedKey.key; 
     279                block_tip += " , Key: " + key; 
     280 
     281                if ("score" in computedKey) { 
     282                var perc = 100*computedKey.score; 
     283                block_tip += " with " + perc.toFixed(1) + "% confidence rating"; 
     284                } 
     285            } 
     286 
     287            block_rect.attr({ "title": block_tip}); 
     288 
     289            go_top_level_group.push(block_rect); 
     290            } 
    272291 
    273292        } 
  • main/trunk/model-sites-dev/respooled/collect/popup-video-respooled/js/media-player.js

    r29888 r29898  
    305305 
    306306 
     307function toggleGraphicEQ() 
     308{ 
     309    $('#grapheqControlL').toggle(); 
     310    $('#grapheqControlR').toggle(); 
     311 
     312    return false; 
     313 
     314} 
    307315 
    308316function saveRecording() 
  • main/trunk/model-sites-dev/respooled/collect/popup-video-respooled/style/media-player.css

    r29895 r29898  
    127127    background-position: 50%; 
    128128} 
     129 
     130#eq-button { 
     131    background:transparent url('images/eq-control.png') no-repeat 0 0px; 
     132} 
  • main/trunk/model-sites-dev/respooled/collect/popup-video-respooled/style/style.css

    r29863 r29898  
    6565 
    6666 
     67.ui-dialog { 
     68    z-index: 10; 
     69} 
  • main/trunk/model-sites-dev/respooled/collect/popup-video-respooled/transform/pages/document.xsl

    r29895 r29898  
    843843            var offset = (35 * numSliders) + 12; 
    844844        if (side == "L") { 
     845            offset += 30; // fudge factor 
    845846            $('#grapheqControlL').css("left","-" + offset + "px"); 
    846847        } 
    847848        else if (side == "R") { 
    848             offset += 5; // fudge factor 
     849            offset += 35; // fudge factor, used to be 5 
    849850            $('#grapheqControlR').css("right","-" + offset + "px"); 
    850851        } 
     
    941942 
    942943 
    943     <div id="grapheqControlL" class="control" style="position: absolute; top: 0px; left: -132px; heightXX: 200px"> 
     944    <div id="grapheqControlL" class="control" style="position: absolute; top: 280px; left: -132px; heightXX: 200px"> 
    944945 
    945946      <h3 style="float: left;">Graphic Equalizer (left channel)</h3> 
     
    982983--> 
    983984 
    984     <div id="grapheqControlR" class="control" style="position: absolute; top: 0px; right: -330px; heightXX: 200px"> 
     985    <div id="grapheqControlR" class="control" style="position: absolute; top: 280px; right: -330px; heightXX: 200px"> 
    985986      <h3 style="float: left;">Graphic Equalizer (right channel)</h3> 
    986987 
     
    13271328<div> 
    13281329 
     1330 
    13291331  <div id='media-player' style="width: 96%"> 
    13301332 
     
    14201422        <span id="mediaPlayerTotalTime">0:00.0</span> 
    14211423      </div> 
     1424      <button id="eq-button" class="button" title="Show/Hide graphics equalilzer" onclick="return toggleGraphicEQ()">EQ</button> 
    14221425      <button id='volume-dec-button' class='button volume-minus' title='decrease volume' onclick="changeVolume('-');">Decrease volume</button> 
    14231426      <button id='volume-inc-button' class='button volume-plus' title='increase volume' onclick="changeVolume('+');">Increase volume</button> 
     
    14271430    </div> 
    14281431 
     1432 
     1433    <div style="clear: both;"><xsl:comment>clear floats</xsl:comment></div> 
     1434 
     1435    <xsl:call-template name="graphic-equalizers"/> 
    14291436 
    14301437    <div style="clear: both;"><xsl:comment>clear floats</xsl:comment></div>