[vlc-devel] commit: Add option to disable embedded video in the simple prefs. ( Antoine Cellerier )
git version control
git at videolan.org
Fri Sep 5 02:17:13 CEST 2008
vlc | branch: 0.9-bugfix | Antoine Cellerier <dionoea at videolan.org> | Fri Sep 5 02:19:45 2008 +0200| [1abb581fc2f263fb305d7f5e5cffc05aeb222192] | committer: Antoine Cellerier
Add option to disable embedded video in the simple prefs.
(cherry picked from commit c1a144df34204a213648092615d01a113e9af076)
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1abb581fc2f263fb305d7f5e5cffc05aeb222192
---
modules/gui/qt4/components/simple_preferences.cpp | 1 +
modules/gui/qt4/ui/sprefs_video.ui | 17 ++++++++++++++---
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp
index dd6ea8d..74fa6f4 100644
--- 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 bcb7853..9013119 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>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>
More information about the vlc-devel
mailing list