Add option to disable embedded video in the simple prefs.

diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp
index dd6ea8d5724e56bd7e7938067194c4b588a14789..74fa6f48d9de99d669e55b7c420e701c9ff86b9d 100644 (file)
--- a/modules/gui/qt4/components/simple_preferences.cpp
+++ b/modules/gui/qt4/components/simple_preferences.cpp
@@ -188,6 +188,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
             CONFIG_GENERIC( "video-on-top", Bool, NULL, alwaysOnTop );
             CONFIG_GENERIC( "video-deco", Bool, NULL, windowDecorations );
             CONFIG_GENERIC( "skip-frames" , Bool, NULL, skipFrames );
+            CONFIG_GENERIC( "embedded-video", Bool, NULL, embeddedVideo );
             CONFIG_GENERIC( "vout", Module, NULL, outputModule );
 
 #ifdef WIN32

diff --git a/modules/gui/qt4/ui/sprefs_video.ui b/modules/gui/qt4/ui/sprefs_video.ui
index bcb785368bb221c99f64a8fb62e245d61c0fecc6..9013119a4ccda1ede31a7ea0e0db8e0e8a9eed62 100644 (file)
--- a/modules/gui/qt4/ui/sprefs_video.ui
+++ b/modules/gui/qt4/ui/sprefs_video.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>408</width>
+    <width>526</width>
     <height>513</height>
    </rect>
   </property>
@@ -69,10 +69,10 @@
         </property>
        </widget>
       </item>
-      <item row="3" column="1" colspan="2" >
+      <item row="4" column="1" colspan="2" >
        <widget class="QComboBox" name="outputModule" />
       </item>
-      <item row="3" column="0" >
+      <item row="4" column="0" >
        <widget class="QLabel" name="label_4" >
         <property name="text" >
          <string>_("Output")</string>
@@ -105,6 +105,13 @@
         </property>
        </widget>
       </item>
+      <item row="2" column="2" >
+       <widget class="QCheckBox" name="embeddedVideo" >
+        <property name="text" >
+         <string>_("Embedded video")</string>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>
@@ -141,6 +148,10 @@
        </widget>
       </item>
      </layout>
+     <zorder>dXdisplayDevice</zorder>
+     <zorder>label_5</zorder>
+     <zorder>wallpaperMode</zorder>
+     <zorder>displayBox</zorder>
     </widget>
    </item>
    <item>