Commit efd3ce8f authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Qt4: remove wallpaper from simple prefs and allow it on the video menu

parent 2b3f7fc5
......@@ -222,7 +222,6 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
CONFIG_BOOL( "video-deco", windowDecorations );
CONFIG_GENERIC( "vout", Module, ui.voutLabel, outputModule );
CONFIG_BOOL( "video-wallpaper", wallpaperMode );
#ifdef WIN32
CONFIG_GENERIC( "directx-device", StringList, ui.dxDeviceLabel,
dXdisplayDevice );
......
......@@ -652,9 +652,8 @@ QMenu *VLCMenuBar::VideoMenu( intf_thread_t *p_intf, QMenu *current, bool b_subt
addActionWithCheckbox( current, "direct3d-desktop", qtr( "Display on &Desktop" ) );
#endif
#ifdef WIN32
addActionWithCheckbox( current, "video-wallpaper", qtr( "Set as Wall&paper" ) );
#endif
current->addSeparator();
/* Size modifiers */
addActionWithSubmenu( current, "zoom", qtr( "&Zoom" ) );
......
......@@ -110,10 +110,10 @@
<property name="spacing">
<number>6</number>
</property>
<item row="1" column="1" colspan="2">
<item row="0" column="1" colspan="2">
<widget class="QComboBox" name="dXdisplayDevice"/>
</item>
<item row="1" column="0">
<item row="0" column="0">
<widget class="QLabel" name="dxDeviceLabel">
<property name="text">
<string>Display device</string>
......@@ -123,44 +123,37 @@
</property>
</widget>
</item>
<item row="0" column="0" colspan="3">
<widget class="QCheckBox" name="wallpaperMode">
<property name="text">
<string>Enable wallpaper mode</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="kvaBox" >
<property name="title" >
<widget class="QGroupBox" name="kvaBox">
<property name="title">
<string>KVA</string>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<layout class="QGridLayout">
<property name="margin">
<number>9</number>
</property>
<property name="spacing" >
<property name="spacing">
<number>6</number>
</property>
<item row="1" column="1" colspan="2" >
<widget class="QComboBox" name="kvaVideoMode" />
<item row="1" column="1" colspan="2">
<widget class="QComboBox" name="kvaVideoMode"/>
</item>
<item row="1" column="0" >
<widget class="QLabel" name="kvaVideoModeLabel" >
<property name="text" >
<item row="1" column="0">
<widget class="QLabel" name="kvaVideoModeLabel">
<property name="text">
<string>Video mode</string>
</property>
<property name="buddy" >
<property name="buddy">
<cstring>kvaVideoMode</cstring>
</property>
</widget>
</item>
<item row="0" column="0" colspan="2" >
<widget class="QCheckBox" name="kvaFixT23" >
<property name="text" >
<item row="0" column="0" colspan="2">
<widget class="QCheckBox" name="kvaFixT23">
<property name="text">
<string>Enable a workaround for T23</string>
</property>
</widget>
......@@ -334,7 +327,6 @@
<tabstop>alwaysOnTop</tabstop>
<tabstop>windowDecorations</tabstop>
<tabstop>outputModule</tabstop>
<tabstop>wallpaperMode</tabstop>
<tabstop>dXdisplayDevice</tabstop>
<tabstop>kvaFixT23</tabstop>
<tabstop>kvaVideoMode</tabstop>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment