diff -r ecf06a08d4d9 -r 3ec52facab4d mpviewplugins/mpplaybackviewplugin/src/mpequalizerwidget.cpp --- a/mpviewplugins/mpplaybackviewplugin/src/mpequalizerwidget.cpp Mon May 03 12:29:20 2010 +0300 +++ b/mpviewplugins/mpplaybackviewplugin/src/mpequalizerwidget.cpp Fri May 14 15:49:53 2010 +0300 @@ -86,18 +86,19 @@ { TX_ENTRY + HbAction *action; setTimeout(NoTimeout); + setModal( true ); setDismissPolicy(HbDialog::NoDismiss); setFrameType(HbPopup::Strong); - setHeadingWidget(new HbLabel(hbTrId("txt_mus_title_select_preset"))); - setPrimaryAction(new HbAction(hbTrId("txt_common_button_ok"))); - setSecondaryAction(new HbAction(hbTrId("txt_common_button_cancel"))); - + setHeadingWidget(new HbLabel(hbTrId("txt_mus_title_select_preset"))); + + if ( mEqualizerReady ) { mOriginalPreset = mEqualizerWrapper->activePreset(); QStringList listItems = mEqualizerWrapper->presetNames(); listItems.prepend(hbTrId("txt_mus_list_off")); - + int presetSelected; if (mOriginalPreset == KEqualizerPresetNone) { presetSelected = 0; //First list item corresponds to "OFF" @@ -105,25 +106,23 @@ else { presetSelected = mOriginalPreset; } - + mPresetsList = new HbRadioButtonList(listItems, presetSelected, HbRadioButtonList::NoPreview, this); setContentWidget( mPresetsList ); //mPresetsList now owned by HbDialog - + connect( mPresetsList, SIGNAL(itemSelected(int)), this, SLOT(presetSelected(int))); } - connect( secondaryAction(), - SIGNAL( triggered(bool) ), - this, - SLOT( cancelSelected(bool) ) ); - - connect( primaryAction(), - SIGNAL( triggered(bool) ), - this, - SLOT( okSelected(bool) ) ); + clearActions(); + action = new HbAction( hbTrId( "txt_common_button_ok" ) ); + connect( action, SIGNAL( triggered( bool ) ), this, SLOT( okSelected( bool ) ) ); + addAction( action ); + action = new HbAction( hbTrId( "txt_common_button_cancel" ) ); + connect( action, SIGNAL( triggered( bool ) ), this, SLOT( cancelSelected( bool ) ) ); + addAction( action ); TX_EXIT }