vlc/vlc-1.2 | branch: master | Jean-Baptiste Kempf <j...@videolan.org> | Mon Jan 9 14:36:02 2012 +0100| [6e04904ccc854d017427090453dbd6e85da08084] | committer: Jean-Baptiste Kempf
Qt4: remove wallpaper from simple prefs and allow it on the video menu (cherry picked from commit efd3ce8fa8000a626ad0b7fcaf4cb1f288c2c487) Signed-off-by: Jean-Baptiste Kempf <j...@videolan.org> > http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=6e04904ccc854d017427090453dbd6e85da08084 --- modules/gui/qt4/components/simple_preferences.cpp | 1 - modules/gui/qt4/menus.cpp | 3 +- modules/gui/qt4/ui/sprefs_video.ui | 42 ++++++++------------ 3 files changed, 18 insertions(+), 28 deletions(-) diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp index 34aa23f..83d1911 100644 --- a/modules/gui/qt4/components/simple_preferences.cpp +++ b/modules/gui/qt4/components/simple_preferences.cpp @@ -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 ); diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp index 521fa50..af2654d 100644 --- a/modules/gui/qt4/menus.cpp +++ b/modules/gui/qt4/menus.cpp @@ -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" ) ); diff --git a/modules/gui/qt4/ui/sprefs_video.ui b/modules/gui/qt4/ui/sprefs_video.ui index c231a56..3f51da1 100644 --- a/modules/gui/qt4/ui/sprefs_video.ui +++ b/modules/gui/qt4/ui/sprefs_video.ui @@ -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,50 +123,43 @@ </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> </item> </layout> - </widget> + </widget> </item> <item> <widget class="QGroupBox" name="groupBox_2"> @@ -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> _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org http://mailman.videolan.org/listinfo/vlc-commits