vlc | branch: master | Jean-Baptiste Kempf <[email protected]> | Mon Sep 26 00:49:15 2011 +0200| [bc195211db2280356d26bcaefea14b54c0759147] | committer: Jean-Baptiste Kempf
Qt, Sprefs: hide the style selection on Win32 and fix it > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=bc195211db2280356d26bcaefea14b54c0759147 --- modules/gui/qt4/components/simple_preferences.cpp | 3 ++- modules/gui/qt4/ui/sprefs_interface.ui | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp index 9a43bf5..b79dcb5 100644 --- a/modules/gui/qt4/components/simple_preferences.cpp +++ b/modules/gui/qt4/components/simple_preferences.cpp @@ -543,7 +543,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, optionWidgets.append( ui.skins ); optionWidgets.append( ui.qt4 ); -#if !defined(NDEBUG) || !defined( WIN32) +#if !defined( WIN32) ui.stylesCombo->addItem( qtr("System's default") ); ui.stylesCombo->addItems( QStyleFactory::keys() ); ui.stylesCombo->setCurrentIndex( ui.stylesCombo->findText( @@ -556,6 +556,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, optionWidgets.append( ui.stylesCombo ); #else ui.stylesCombo->hide(); + ui.stylesLabel->hide(); optionWidgets.append( NULL ); #endif radioGroup = new QButtonGroup(this); diff --git a/modules/gui/qt4/ui/sprefs_interface.ui b/modules/gui/qt4/ui/sprefs_interface.ui index a463ebf..dacf55a 100644 --- a/modules/gui/qt4/ui/sprefs_interface.ui +++ b/modules/gui/qt4/ui/sprefs_interface.ui @@ -495,7 +495,7 @@ </widget> </item> <item row="5" column="0"> - <widget class="QLabel" name="label"> + <widget class="QLabel" name="stylesLabel"> <property name="sizePolicy"> <sizepolicy hsizetype="Maximum" vsizetype="Preferred"> <horstretch>0</horstretch> _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
