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, ...@@ -222,7 +222,6 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
CONFIG_BOOL( "video-deco", windowDecorations ); CONFIG_BOOL( "video-deco", windowDecorations );
CONFIG_GENERIC( "vout", Module, ui.voutLabel, outputModule ); CONFIG_GENERIC( "vout", Module, ui.voutLabel, outputModule );
CONFIG_BOOL( "video-wallpaper", wallpaperMode );
#ifdef WIN32 #ifdef WIN32
CONFIG_GENERIC( "directx-device", StringList, ui.dxDeviceLabel, CONFIG_GENERIC( "directx-device", StringList, ui.dxDeviceLabel,
dXdisplayDevice ); dXdisplayDevice );
......
...@@ -652,9 +652,8 @@ QMenu *VLCMenuBar::VideoMenu( intf_thread_t *p_intf, QMenu *current, bool b_subt ...@@ -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" ) ); addActionWithCheckbox( current, "direct3d-desktop", qtr( "Display on &Desktop" ) );
#endif #endif
#ifdef WIN32
addActionWithCheckbox( current, "video-wallpaper", qtr( "Set as Wall&paper" ) ); addActionWithCheckbox( current, "video-wallpaper", qtr( "Set as Wall&paper" ) );
#endif
current->addSeparator(); current->addSeparator();
/* Size modifiers */ /* Size modifiers */
addActionWithSubmenu( current, "zoom", qtr( "&Zoom" ) ); addActionWithSubmenu( current, "zoom", qtr( "&Zoom" ) );
......
...@@ -110,10 +110,10 @@ ...@@ -110,10 +110,10 @@
<property name="spacing"> <property name="spacing">
<number>6</number> <number>6</number>
</property> </property>
<item row="1" column="1" colspan="2"> <item row="0" column="1" colspan="2">
<widget class="QComboBox" name="dXdisplayDevice"/> <widget class="QComboBox" name="dXdisplayDevice"/>
</item> </item>
<item row="1" column="0"> <item row="0" column="0">
<widget class="QLabel" name="dxDeviceLabel"> <widget class="QLabel" name="dxDeviceLabel">
<property name="text"> <property name="text">
<string>Display device</string> <string>Display device</string>
...@@ -123,50 +123,43 @@ ...@@ -123,50 +123,43 @@
</property> </property>
</widget> </widget>
</item> </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> </layout>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QGroupBox" name="kvaBox" > <widget class="QGroupBox" name="kvaBox">
<property name="title" > <property name="title">
<string>KVA</string> <string>KVA</string>
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout">
<property name="margin" > <property name="margin">
<number>9</number> <number>9</number>
</property> </property>
<property name="spacing" > <property name="spacing">
<number>6</number> <number>6</number>
</property> </property>
<item row="1" column="1" colspan="2" > <item row="1" column="1" colspan="2">
<widget class="QComboBox" name="kvaVideoMode" /> <widget class="QComboBox" name="kvaVideoMode"/>
</item> </item>
<item row="1" column="0" > <item row="1" column="0">
<widget class="QLabel" name="kvaVideoModeLabel" > <widget class="QLabel" name="kvaVideoModeLabel">
<property name="text" > <property name="text">
<string>Video mode</string> <string>Video mode</string>
</property> </property>
<property name="buddy" > <property name="buddy">
<cstring>kvaVideoMode</cstring> <cstring>kvaVideoMode</cstring>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="0" colspan="2" > <item row="0" column="0" colspan="2">
<widget class="QCheckBox" name="kvaFixT23" > <widget class="QCheckBox" name="kvaFixT23">
<property name="text" > <property name="text">
<string>Enable a workaround for T23</string> <string>Enable a workaround for T23</string>
</property> </property>
</widget> </widget>
</item> </item>
</layout> </layout>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QGroupBox" name="groupBox_2"> <widget class="QGroupBox" name="groupBox_2">
...@@ -334,7 +327,6 @@ ...@@ -334,7 +327,6 @@
<tabstop>alwaysOnTop</tabstop> <tabstop>alwaysOnTop</tabstop>
<tabstop>windowDecorations</tabstop> <tabstop>windowDecorations</tabstop>
<tabstop>outputModule</tabstop> <tabstop>outputModule</tabstop>
<tabstop>wallpaperMode</tabstop>
<tabstop>dXdisplayDevice</tabstop> <tabstop>dXdisplayDevice</tabstop>
<tabstop>kvaFixT23</tabstop> <tabstop>kvaFixT23</tabstop>
<tabstop>kvaVideoMode</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