Changeset 1aff501d32fbab62f1c5f2d7fad39e91e8c4150d

Show
Ignore:
Timestamp:
30/04/06 21:16:39 (3 years ago)
Author:
Antoine Cellerier <dionoea@videolan.org>
git-committer:
Antoine Cellerier <dionoea@videolan.org> 1146424599 +0000
git-parent:

[34e223883058ef37c736a927a1ea4daa12ac8eb5]

git-author:
Antoine Cellerier <dionoea@videolan.org> 1146424599 +0000
Message:

Forward port [15485] and [15486].

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • doc/skins/skins2-howto.xml

    re3aa4d0 r1aff501  
    578578  <sect4 id="textscrolling"> 
    579579    <title>scrolling</title> 
    580     <para>Scrolling behaviour of the text (only when it doesn't fit in the <link linkend="textwidth">width</link> of the control). Possible values are 'auto', 'autooff', 'manual' and 'none'. If this attribute is set to 'auto', the text automatically starts scrolling. The user can drag the text, and click on it to start/stop the scrolling. If this attribute is set to 'manual', the text only scrolls when dragged by the user. If this attribute is set to 'none', no scrolling is possible at all. Available since VLC 0.8.5.</para> 
     580    <para>Scrolling behaviour of the text (only when it doesn't fit in the <link linkend="textwidth">width</link> of the control). Possible values are 'auto', 'manual' and 'none'. If this attribute is set to 'auto', the text automatically starts scrolling. The user can drag the text, and click on it to start/stop the scrolling. If this attribute is set to 'manual', the text only scrolls when dragged by the user. If this attribute is set to 'none', no scrolling is possible at all. Available since VLC 0.8.5.</para> 
    581581    <para>Default value: auto</para> 
    582582  </sect4> 

  • modules/gui/skins2/controls/ctrl_text.cpp

    re3aa4d0 r1aff501  
    7575        m_fsm.addTransition( "manual1", "motion", "manual1", &m_cmdMove ); 
    7676    } 
    77     else if( m_scrollMode == kAutomatic || m_scrollMode == kAutomaticOff ) 
     77    else if( m_scrollMode == kAutomatic ) 
    7878    { 
    7979        m_fsm.addTransition( "still", "mouse:left:down", "manual1", 
    …… 
    9292 
    9393    // Initial state 
    94     if( m_scrollMode == kAutomatic ) 
    95         m_fsm.setState( "outMoving" ); 
    96     else 
    97         m_fsm.setState( "outStill" ); 
     94    m_fsm.setState( "outStill" ); 
    9895 
    9996    // Observe the variable 

  • modules/gui/skins2/controls/ctrl_text.hpp

    re3aa4d0 r1aff501  
    5555            // scroll manually with the mouse. 
    5656            kAutomatic, 
    57             // Same as above butt default state is off 
    58             kAutomaticOff, 
    5957            // Only manual scrolling is allowed (with the mouse) 
    6058            kManual, 

  • modules/gui/skins2/parser/builder.cpp

    re3aa4d0 r1aff501  
    608608    if( rData.m_scrolling == "auto" ) 
    609609        scrolling = CtrlText::kAutomatic; 
    610     else if( rData.m_scrolling == "autooff" ) 
    611         scrolling = CtrlText::kAutomaticOff; 
    612610    else if( rData.m_scrolling == "manual" ) 
    613611        scrolling = CtrlText::kManual; 

  • modules/services_discovery/podcast.c

    r0263f8f r1aff501  
    203203        } 
    204204    } 
     205    free( p_sd->p_sys->pp_input ); 
    205206    if( p_playlist ) 
    206207    { 

  • share/skins2/default/theme.xml

    re3aa4d0 r1aff501  
    215215         
    216216         
    217         <Text x="21" y="207" alignment="left" color="#FFFFFF" font="mainfont" lefttop="leftbottom" rightbottom="rightbottom" width="320" text="$N" visible="not dvd.isActive" scrolling="autooff"/> 
    218          
    219         <Text x="125" y="207" alignment="left" color="#FFFFFF" font="mainfont" lefttop="leftbottom" rightbottom="rightbottom" width="215" text="$N" visible="dvd.isActive" scrolling="autooff"/> 
     217        <Text x="21" y="207" alignment="left" color="#FFFFFF" font="mainfont" lefttop="leftbottom" rightbottom="rightbottom" width="320" text="$N" visible="not dvd.isActive"/> 
     218         
     219        <Text x="125" y="207" alignment="left" color="#FFFFFF" font="mainfont" lefttop="leftbottom" rightbottom="rightbottom" width="215" text="$N" visible="dvd.isActive"/> 
    220220        <Text x="342" y="208" alignment="right" color="#FFFFFF" font="defaultfont" lefttop="rightbottom" rightbottom="rightbottom" width="88" text="$T/$D"/> 
    221221        <Button x="21" y="207" up="dvd_prevtitle" action="dvd.previousTitle()" tooltiptext="Play Previous Title on DVD" lefttop="leftbottom" rightbottom="rightbottom" visible="dvd.isActive"/> 
    …… 
    343343        <Image x="0" y="0" action="move" image="minimal_bg"/> 
    344344 
    345         <Text x="10" y="20" alignment="left" color="#FFFFFF" font="mainfont" text="$N" width="190" scrolling="autooff"/> 
     345        <Text x="10" y="20" alignment="left" color="#FFFFFF" font="mainfont" text="$N" width="190"/> 
    346346        <Text x="202" y="21" alignment="right" color="#FFFFFF" font="defaultfont" text="$T/$D" width="88"/> 
    347347        <Slider x="10" y="42" points="(5,0),(275,0)" up="timeslider" value="time" tooltiptext="$T / $D"/>