vlc/vlc-1.2 | branch: master | Jean-Baptiste Kempf <[email protected]> | Sat Jan 7 01:53:06 2012 +0100| [e4af18e126c2e041dda000421b0f3d03346b0d1b] | committer: Jean-Baptiste Kempf
Qt: use "normvol" instead of "volnorm" in Simple Preferences Close #5792 (cherry picked from commit 28958fd5930d1efe9801213354b4998e4a881fc4) Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=e4af18e126c2e041dda000421b0f3d03346b0d1b --- modules/gui/qt4/components/simple_preferences.cpp | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp index b6f6f30..34aa23f 100644 --- a/modules/gui/qt4/components/simple_preferences.cpp +++ b/modules/gui/qt4/components/simple_preferences.cpp @@ -408,7 +408,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, qs_filter = qfu( psz ).split( ':', QString::SkipEmptyParts ); free( psz ); - bool b_enabled = ( qs_filter.contains( "volnorm" ) ); + bool b_enabled = ( qs_filter.contains( "normvol" ) ); ui.volNormBox->setChecked( b_enabled ); ui.volNormSpin->setEnabled( b_enabled ); @@ -829,10 +829,10 @@ void SPrefsPanel::apply() { bool b_checked = qobject_cast<QCheckBox *>(optionWidgets[normalizerChB])->isChecked(); - if( b_checked && !qs_filter.contains( "volnorm" ) ) - qs_filter.append( "volnorm" ); - if( !b_checked && qs_filter.contains( "volnorm" ) ) - qs_filter.removeAll( "volnorm" ); + if( b_checked && !qs_filter.contains( "normvol" ) ) + qs_filter.append( "normvol" ); + if( !b_checked && qs_filter.contains( "normvol" ) ) + qs_filter.removeAll( "normvol" ); b_checked = qobject_cast<QCheckBox *>(optionWidgets[headphoneB])->isChecked(); _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
