Changeset 21dd718af658c6942efe5249e7adb719f9dab990

Show
Ignore:
Timestamp:
06/09/07 13:59:32 (1 year ago)
Author:
Jean-Baptiste Kempf <jb@videolan.org>
git-committer:
Jean-Baptiste Kempf <jb@videolan.org> 1189079972 +0000
git-parent:

[321b69870b1a193ba209f76b4aab3be24accdd2a]

git-author:
Jean-Baptiste Kempf <jb@videolan.org> 1189079972 +0000
Message:

Qt4 - Sout: hide SAP options and ttl options when you don't stream. Adapt the label on the okButton according...

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/gui/qt4/dialogs/sout.cpp

    r23a9ce0 r21dd718  
    3636{ 
    3737    setWindowTitle( qtr( "Stream output" ) ); 
     38 
     39    b_transcode_only = _transcode_only; 
    3840 
    3941    /* UI stuff */ 
    …… 
    115117    CONNECT( ui.rawInput, toggled( bool ), this, setRawOptions( bool ) ); 
    116118 
    117     QPushButton *okButton = new QPushButton( qtr( "&Stream" ) ); 
     119    okButton = new QPushButton( qtr( "&Stream" ) ); 
    118120    QPushButton *cancelButton = new QPushButton( qtr( "&Cancel" ) ); 
    119121 
    …… 
    125127    BUTTONACT( cancelButton, cancel() ); 
    126128 
    127     if( _transcode_only ) toggleSout(); 
     129    if( b_transcode_only ) toggleSout(); 
    128130} 
    129131 
    …… 
    222224void SoutDialog::toggleSout() 
    223225{ 
     226    //Toggle all the streaming options. 
    224227    #define TGV( x ) { \ 
    225228        if( ( x->isHidden() ) )  \ 
    …… 
    232235    TGV( ui.HTTPPortLabel ) ; TGV( ui.UDPPortLabel ) ; TGV( ui.MMSHPortLabel ) ; 
    233236    TGV( ui.HTTPPort ) ; TGV( ui.UDPPort ) ; TGV( ui.MMSHPort ) ; 
     237 
     238    TGV( ui.sap ); TGV( ui.sapName ); 
     239    TGV( ui.sapGroup ); TGV( ui.sapGroupLabel ); 
     240    TGV( ui.ttlLabel ); TGV( ui.ttl ); 
     241 
     242    if( b_transcode_only ) okButton->setText( "&Save" ); 
     243    else okButton->setText( "&Stream" ); 
     244 
    234245    updateGeometry(); 
    235246} 

  • modules/gui/qt4/dialogs/sout.hpp

    rfbb3c56 r21dd718  
    4848private: 
    4949    Ui::Sout ui; 
    50      
     50    QPushButton *okButton; 
     51    bool b_transcode_only; 
    5152public slots: 
    5253    void ok(); 

  • modules/gui/qt4/ui/sout.ui

    r23a9ce0 r21dd718  
    658658        </item> 
    659659        <item row="1" column="3" > 
    660          <widget class="QLabel" name="label_10" > 
     660         <widget class="QLabel" name="ttlLabel" > 
    661661          <property name="text" > 
    662662           <string>_("Time-To-Live (TTL)")</string>