Changeset c1a144df34204a213648092615d01a113e9af076

Show
Ignore:
Timestamp:
05/09/08 02:19:45 (3 months ago)
Author:
Antoine Cellerier <dionoea@videolan.org>
git-committer:
Antoine Cellerier <dionoea@videolan.org> 1220573985 +0200
git-parent:

[446be1c21341517cc6324b407fe1ac0c6c18ccdb]

git-author:
Antoine Cellerier <dionoea@videolan.org> 1220573985 +0200
Message:

Add option to disable embedded video in the simple prefs.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • modules/gui/qt4/components/simple_preferences.cpp

    r5d313c6 rc1a144d  
    189189            CONFIG_GENERIC( "video-deco", Bool, NULL, windowDecorations ); 
    190190            CONFIG_GENERIC( "skip-frames" , Bool, NULL, skipFrames ); 
     191            CONFIG_GENERIC( "embedded-video", Bool, NULL, embeddedVideo ); 
    191192            CONFIG_GENERIC( "vout", Module, NULL, outputModule ); 
    192193 
  • modules/gui/qt4/ui/sprefs_video.ui

    r2234190 rc1a144d  
    77    <x>0</x> 
    88    <y>0</y> 
    9     <width>408</width> 
     9    <width>526</width> 
    1010    <height>513</height> 
    1111   </rect> 
     
    7070       </widget> 
    7171      </item> 
    72       <item row="3" column="1" colspan="2" > 
     72      <item row="4" column="1" colspan="2" > 
    7373       <widget class="QComboBox" name="outputModule" /> 
    7474      </item> 
    75       <item row="3" column="0" > 
     75      <item row="4" column="0" > 
    7676       <widget class="QLabel" name="label_4" > 
    7777        <property name="text" > 
     
    103103        <property name="checked" > 
    104104         <bool>true</bool> 
     105        </property> 
     106       </widget> 
     107      </item> 
     108      <item row="2" column="2" > 
     109       <widget class="QCheckBox" name="embeddedVideo" > 
     110        <property name="text" > 
     111         <string>_("Embedded video")</string> 
    105112        </property> 
    106113       </widget> 
     
    142149      </item> 
    143150     </layout> 
     151     <zorder>dXdisplayDevice</zorder> 
     152     <zorder>label_5</zorder> 
     153     <zorder>wallpaperMode</zorder> 
     154     <zorder>displayBox</zorder> 
    144155    </widget> 
    145156   </item>