[vlc-devel] commit: Revert "Add option to disable embedded video in the simple prefs." (Antoine Cellerier )

[git version control]

vlc | branch: master | Antoine Cellerier <dionoea at videolan.org> | Fri Sep  5 02:24:33 2008 +0200| [75adb51903e7a81aab1e482fa96b953e4110f9cf] | committer: Antoine Cellerier 

Revert "Add option to disable embedded video in the simple prefs."

Already available in the interface sprefs.
This reverts commit c1a144df34204a213648092615d01a113e9af076.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=75adb51903e7a81aab1e482fa96b953e4110f9cf
---

 modules/gui/qt4/components/simple_preferences.cpp |    1 -
 modules/gui/qt4/ui/sprefs_video.ui                |   17 +++--------------
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp
index 74fa6f4..dd6ea8d 100644
--- a/modules/gui/qt4/components/simple_preferences.cpp
+++ b/modules/gui/qt4/components/simple_preferences.cpp
@@ -188,7 +188,6 @@ 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 9013119..bcb7853 100644
--- 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>526</width>
+    <width>408</width>
     <height>513</height>
    </rect>
   </property>
@@ -69,10 +69,10 @@
         </property>
        </widget>
       </item>
-      <item row="4" column="1" colspan="2" >
+      <item row="3" column="1" colspan="2" >
        <widget class="QComboBox" name="outputModule" />
       </item>
-      <item row="4" column="0" >
+      <item row="3" column="0" >
        <widget class="QLabel" name="label_4" >
         <property name="text" >
          <string>_("Output")</string>
@@ -105,13 +105,6 @@
         </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>
@@ -148,10 +141,6 @@
        </widget>
       </item>
      </layout>
-     <zorder>dXdisplayDevice</zorder>
-     <zorder>label_5</zorder>
-     <zorder>wallpaperMode</zorder>
-     <zorder>displayBox</zorder>
     </widget>
    </item>
    <item>