# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1272878723 -10800 # Node ID 2e1adbfc62af97f42bd7fa9d91e6c8775ae24eb7 # Parent 09774dfdd46b1bd1fc9873429f43212245c84cca Revision: 201015 Kit: 201018 diff -r 09774dfdd46b -r 2e1adbfc62af internetradio2.0/settingsviewinc/ircommonsettingscontainer.h --- a/internetradio2.0/settingsviewinc/ircommonsettingscontainer.h Mon Apr 19 14:01:53 2010 +0300 +++ b/internetradio2.0/settingsviewinc/ircommonsettingscontainer.h Mon May 03 12:25:23 2010 +0300 @@ -20,11 +20,9 @@ #define C_CIRCOMMONSETTINGSCONTAINER_H #include -#include #include "irsettings.h" class CIRNetworkController; -using namespace CMManager; //Added for ALR/SNAP enum TUserSelection @@ -75,7 +73,6 @@ * GetUserSelectionL() * Queries the Settings and returns the user selected IAP/SNAP */ - TCmSettingSelectionMode GetUserSelectionL(); /** * SetAccessPointDetailsL() diff -r 09774dfdd46b -r 2e1adbfc62af internetradio2.0/settingsviewsrc/ircommonsettingscontainer.cpp --- a/internetradio2.0/settingsviewsrc/ircommonsettingscontainer.cpp Mon Apr 19 14:01:53 2010 +0300 +++ b/internetradio2.0/settingsviewsrc/ircommonsettingscontainer.cpp Mon May 03 12:25:23 2010 +0300 @@ -24,7 +24,6 @@ #include #include "ircommonsettingscontainer.h" #include "ir.hrh" -#include #include "irnetworkcontroller.h" #include "iraap.hlp.hrh" #include "irdebug.h" // PC-Lint comments :: SPP @@ -32,7 +31,6 @@ #define KUIDIRAPP 0x2000B499 const TUid KIRMCVUid = {KUIDIRAPP}; -const TInt KBufSize = 256; // ======== LOCAL FUNCTIONS ======== @@ -72,7 +70,6 @@ IRLOG_DEBUG( "CIRCommonSettingsContainer::BaseConstructL - Entering" ); iNetworkController = CIRNetworkController::OpenL(); iIRSettings = CIRSettings::OpenL(); - ConstructFromResourceL( R_IR_SETTING_LIST ); iDestinationSelected = EFalse; SetListBoxTextL() ; IRLOG_DEBUG( "CIRCommonSettingsContainer::BaseConstructL - Exiting" ); @@ -269,74 +266,6 @@ void CIRCommonSettingsContainer::ShowConnectionSettingsUiL() { IRLOG_DEBUG( "CIRCommonSettingsContainer::ShowConnectionSettingsUiL - Entering" ); - TCmSettingSelection userSelection; - userSelection.iResult = GetUserSelectionL() ; - if(userSelection.iResult == EDestination) - { - userSelection.iId = iIRSettings->GetDestinationIdL(); - } - else if(userSelection.iResult == EConnectionMethod) - { - userSelection.iId = iIRSettings->GetApIdL(); - } - else - { - userSelection.iId =0; - } - - CCmApplicationSettingsUi* settings = CCmApplicationSettingsUi::NewL(); - CleanupStack::PushL( settings ); - - TUint listedItems = EShowAlwaysAsk | EShowDefaultConnection | - EShowDestinations | EShowConnectionMethods; - - TBearerFilterArray filter; - TBool selected = EFalse; - - TRAPD( settingsErr, selected = settings->RunApplicationSettingsL( userSelection, - listedItems, filter ) ); - - CleanupStack::PopAndDestroy( settings ); - - if((selected == EFalse) || (settingsErr != KErrNone) ) - { - return; - } - - switch ( userSelection.iResult ) - { - case EAlwaysAsk: - { - iIRSettings->SetUserDefinedSelectionL(EUserSelectionAlwaysAsk); - iIRSettings->SetDisplayAccessPointL(); - break; - } - case EDefaultConnection: - { - iIRSettings->SetUserDefinedSelectionL(EUserSelectionDefaultConnection); - break; - } - - case EDestination: - { - iIRSettings->SetUserDefinedSelectionL(EUserSelectionDestination); - iIRSettings->SetDestinationIdL(userSelection.iId); - iDestinationSelected = ETrue; - break; - } - - case EConnectionMethod: - { - iIRSettings->SetUserDefinedSelectionL(EUserSelectionConnectionMethod); - SetAccessPointDetailsL(userSelection.iId); - iDestinationSelected = EFalse; - break; - } - default: - { - break; - } - } SetListBoxTextL(); IRLOG_DEBUG( "CIRCommonSettingsContainer::ShowConnectionSettingsUiL - Exiting" ); } @@ -362,44 +291,6 @@ } -// --------------------------------------------------------------------------- -// GetUserSelectionL() -// Queries the Settings and returns the user selected IAP/SNAP -// --------------------------------------------------------------------------- -// -TCmSettingSelectionMode CIRCommonSettingsContainer::GetUserSelectionL() - { - IRLOG_DEBUG( "CIRCommonSettingsContainer::GetUserSelectionL - Entering" ); - TUint32 userSelection; - userSelection = iIRSettings->GetUserDefinedSelectionL(); - TCmSettingSelectionMode ret = EAlwaysAsk; - switch(userSelection) - { - case EUserSelectionAlwaysAsk: - ret = EAlwaysAsk; - break; - - case EUserSelectionDefaultConnection: - ret = EDefaultConnection ; - break; - - case EUserSelectionDestination: - ret = EDestination; - break; - - case EUserSelectionConnectionMethod: - ret = EConnectionMethod; - break; - - default: - ret = EAlwaysAsk; - break; - - } - IRLOG_DEBUG( "CIRCommonSettingsContainer::GetUserSelectionL - Exiting" ); - return ret; - } - // --------------------------------------------------------------------------- // SetAccessPointDetailsL() @@ -429,13 +320,6 @@ TUint32 networkId = networkIDArray[index]; TUint32 accessPointId = accessPointIDArray[index]; - //This stores the settings in Central Repository - iIRSettings->SetUserSavedApSettingsL(bearerId, networkId,accessPointId); - - // Save the settings for use by IRNetworkContorller - iIRSettings->SetBearerIdL(bearerId); - iIRSettings->SetNetworkIdL(networkId); - iIRSettings->SetApIdL(accessPointId); IRLOG_DEBUG( "CIRCommonSettingsContainer::SetAccessPointDetailsL - Exiting" ); } @@ -447,90 +331,7 @@ void CIRCommonSettingsContainer::SetListBoxTextL() { IRLOG_DEBUG( "CIRCommonSettingsContainer::SetListBoxTextL - Entering" ); - if(SettingItemArray()->Count()>0) - { - switch(GetUserSelectionL()) - { - case EAlwaysAsk: - { - HBufC* stringholder = StringLoader::LoadLC( R_IR_ACCESS_ASK); - SettingItemArray()->At( 0 )->SetEmptyItemTextL(*stringholder); - CleanupStack::PopAndDestroy(stringholder); - HandleChangeInItemArrayOrVisibilityL(); - ActivateL(); - break; - } - - case EDefaultConnection: - { - HBufC* stringholder = StringLoader::LoadLC( R_IR_SETTINGS_SNAP_DEFAULT); - SettingItemArray()->At( 0 )->SetEmptyItemTextL(*stringholder); - CleanupStack::PopAndDestroy(stringholder); - HandleChangeInItemArrayOrVisibilityL(); - ActivateL(); - break; - } - - case EDestination: - { - RCmManager cmManager; - cmManager.OpenL(); - TRAPD(err, RCmDestination dest = cmManager.DestinationL( iIRSettings->GetDestinationIdL() )); - if (err == KErrNone) - { - RCmDestination dest = cmManager.DestinationL(iIRSettings->GetDestinationIdL()); - CleanupClosePushL( dest ); - - HBufC* destName = dest.NameLC(); - TBuf item; - _LIT( KStringFormat, "%S" ); - item.Format( KStringFormat,destName ); - - SettingItemArray()->At( 0 )->SetEmptyItemTextL(item); - HandleChangeInItemArrayOrVisibilityL(); - ActivateL(); - CleanupStack::PopAndDestroy( destName ); // destName, dest - CleanupStack::PopAndDestroy( &dest); - } - cmManager.Close(); - break; - } - - case EConnectionMethod: - { - if(!iDestinationSelected) - { - iIapArray = iNetworkController->GetAccessPointList(); - const RArray& accessPointIDArray = iNetworkController->GetApList(); - - TInt index = 0; - //Get access point index, that matches the access point stored in - // settings previously - for(TInt i=0; iGetApIdL()) - { - index = i; - } - } - TPtrC list; - list.Set(iIapArray->MdcaPoint(index)); - HBufC* itemText = HBufC::NewLC(list.Length()); - itemText->Des().Copy(list); - - SettingItemArray()->At( 0 )->SetEmptyItemTextL(list); - HandleChangeInItemArrayOrVisibilityL(); - ActivateL(); - CleanupStack::PopAndDestroy(itemText); - } - - break; - } - default: - break; - - } - } + IRLOG_DEBUG( "CIRCommonSettingsContainer::SetListBoxTextL - Exiting" ); } diff -r 09774dfdd46b -r 2e1adbfc62af internetradio2.0/settingsviewsrc/irsettingsviewbase.cpp --- a/internetradio2.0/settingsviewsrc/irsettingsviewbase.cpp Mon Apr 19 14:01:53 2010 +0300 +++ b/internetradio2.0/settingsviewsrc/irsettingsviewbase.cpp Mon May 03 12:25:23 2010 +0300 @@ -26,7 +26,6 @@ #include "ircommonsettingscontainer.h" #include "irsettingsviewbase.h" #include "irdebug.h" -#include #include #include @@ -60,7 +59,6 @@ IRLOG_DEBUG( "CIRSettingsViewBase::BaseConstructL - Entering " ); FeatureManager::InitializeLibL(); LoadResourcesL( iSettingsBaseResourceLoader, KIRSettingsViewResourceFile ); - CAknView::BaseConstructL( R_IR_SETTINGSVIEW ); IRLOG_DEBUG( "CIRSettingsViewBase::BaseConstructL - Exiting " ); } diff -r 09774dfdd46b -r 2e1adbfc62af internetradio2.0/uisrc/irui.cpp --- a/internetradio2.0/uisrc/irui.cpp Mon Apr 19 14:01:53 2010 +0300 +++ b/internetradio2.0/uisrc/irui.cpp Mon May 03 12:25:23 2010 +0300 @@ -55,7 +55,6 @@ #include #include #include -#include #include #include #include @@ -248,8 +247,7 @@ //Call observer - iIsdsWrapper->GetISDSInstance()->GetDataProvider()->GetHttpDataProvider()-> - GetLogoDownloadEngine()->SetFavDbInstance(iFavPresets); + // Create Channel list view iLastPlayed = CIRLastPlayedStationInfo::NewL(); iMainView = CIRMainView::NewL(); diff -r 09774dfdd46b -r 2e1adbfc62af qtinternetradio/install/hb_armv5_urel.pkg --- a/qtinternetradio/install/hb_armv5_urel.pkg Mon Apr 19 14:01:53 2010 +0300 +++ b/qtinternetradio/install/hb_armv5_urel.pkg Mon May 03 12:25:23 2010 +0300 @@ -39,7 +39,6 @@ ; DEPLOYMENT "r:/epoc32/release/armv5/urel/HbCore.dll" - "!:\sys\bin\HbCore.dll" "r:/epoc32/release/armv5/urel/HbWidgets.dll" - "!:\sys\bin\HbWidgets.dll" -"r:/epoc32/release/armv5/urel/HbTools.dll" - "!:\sys\bin\HbTools.dll" "r:/epoc32/release/armv5/urel/HbInput.dll" - "!:\sys\bin\HbInput.dll" "r:/epoc32/release/armv5/urel/HbFeedback.dll" - "!:\sys\bin\HbFeedback.dll" "r:/epoc32/release/armv5/urel/HbTactilePlugin.dll" - "!:\sys\bin\HbTactilePlugin.dll" diff -r 09774dfdd46b -r 2e1adbfc62af qtinternetradio/irqlogger/src/irqlogger.cpp --- a/qtinternetradio/irqlogger/src/irqlogger.cpp Mon Apr 19 14:01:53 2010 +0300 +++ b/qtinternetradio/irqlogger/src/irqlogger.cpp Mon May 03 12:25:23 2010 +0300 @@ -126,9 +126,7 @@ gDebugFile.setFileName( aFileName ); gFilterByLogMarker = aFilterByMarker; - gDebugFile.open( QIODevice::Text | QIODevice::WriteOnly ); - - if ( gDebugFile.isOpen() ) + if (gDebugFile.open( QIODevice::Text | QIODevice::WriteOnly )) { qInstallMsgHandler( FileLogger::handleMessage ); } diff -r 09774dfdd46b -r 2e1adbfc62af qtinternetradio/ui/inc/irplaycontroller.h --- a/qtinternetradio/ui/inc/irplaycontroller.h Mon Apr 19 14:01:53 2010 +0300 +++ b/qtinternetradio/ui/inc/irplaycontroller.h Mon May 03 12:25:23 2010 +0300 @@ -153,7 +153,7 @@ // the URLs of a specific bitrate QList *iUrlArray; -#ifdef __WINS__ +#ifdef Q_CC_NOKIAX86 QString iLastPlayedChannelName; #endif diff -r 09774dfdd46b -r 2e1adbfc62af qtinternetradio/ui/src/irabstractlistviewbase.cpp --- a/qtinternetradio/ui/src/irabstractlistviewbase.cpp Mon Apr 19 14:01:53 2010 +0300 +++ b/qtinternetradio/ui/src/irabstractlistviewbase.cpp Mon May 03 12:25:23 2010 +0300 @@ -129,7 +129,6 @@ void IrAbstractListViewBase::initScrollBar() { - iListView->setScrollingStyle( HbListView::PanOrFlick ); HbScrollBar *scrollbar = iListView->verticalScrollBar(); scrollbar->setVisible(true); scrollbar->setInteractive(true); diff -r 09774dfdd46b -r 2e1adbfc62af qtinternetradio/ui/src/irapplication.cpp --- a/qtinternetradio/ui/src/irapplication.cpp Mon Apr 19 14:01:53 2010 +0300 +++ b/qtinternetradio/ui/src/irapplication.cpp Mon May 03 12:25:23 2010 +0300 @@ -196,10 +196,10 @@ { iConnectingNote = new HbMessageBox(HbMessageBox::MessageTypeInformation); iConnectingNote->setModal(true); - iConnectingNote->setTimeout(HbPopup::NoTimeout); - HbAction *cancelAction = new HbAction(hbTrId("txt_common_button_cancel"), iConnectingNote); - iConnectingNote->setPrimaryAction(cancelAction); - connect(cancelAction, SIGNAL(triggered()), this, SLOT(cancelConnect())); + iConnectingNote->setTimeout(HbPopup::NoTimeout); + QAction *action = iConnectingNote->actions().at(0); + action->setText(hbTrId("txt_common_button_cancel")); + connect(action, SIGNAL(triggered()), this, SLOT(cancelConnect())); } iConnectingNote->setText(iConnectingText); @@ -500,13 +500,7 @@ case EIRQDisplayNetworkMessageNoConnectivity: { closeConnectingDialog(); - HbMessageBox note(hbTrId("txt_irad_info_no_network_connectiion"), HbMessageBox::MessageTypeWarning); - note.exec(); - - //reset setting to 'Always ask' - iSettings->setUserDefinedSelection(EIRAlwaysAsk); - iSettings->setDisplayAccessPoint(); - + HbMessageBox::warning(hbTrId("txt_irad_info_no_network_connectiion"), (QObject*)NULL, NULL); if (!iDisconnected) { /* the handling is up to each view */ @@ -576,11 +570,7 @@ { if (!iIsdsClient->isdsIsConstructSucceed()) { - HbMessageBox note("No available access points, exiting...", HbMessageBox::MessageTypeWarning); - note.setPrimaryAction(NULL); - note.setTimeout(5000); - note.setModal(true); - note.exec(); + HbMessageBox::warning("No available access points, exiting...", (QObject*)NULL, NULL); qApp->quit(); } else @@ -757,7 +747,12 @@ if (error == QAbstractSocket::AddressInUseError && fileExists) { QFile::remove(fullServerName); - iLocalServer->listen(serverName); + bool ret = iLocalServer->listen(serverName); + //following lines aim to fix coverity errors + if (!ret) + { + Q_ASSERT(false); + } } } } diff -r 09774dfdd46b -r 2e1adbfc62af qtinternetradio/ui/src/irbaseview.cpp --- a/qtinternetradio/ui/src/irbaseview.cpp Mon Apr 19 14:01:53 2010 +0300 +++ b/qtinternetradio/ui/src/irbaseview.cpp Mon May 03 12:25:23 2010 +0300 @@ -121,6 +121,17 @@ void IRBaseView::popupNote(const QString &aNote, const HbMessageBox::MessageBoxType &aNoteType) const { - HbMessageBox note(aNote, aNoteType); - note.exec(); + switch (aNoteType) + { + case HbMessageBox::MessageTypeInformation: + HbMessageBox::information(aNote, (QObject*)NULL, NULL); + break; + + case HbMessageBox::MessageTypeWarning: + HbMessageBox::warning(aNote, (QObject*)NULL, NULL); + break; + + default: + break; + } } diff -r 09774dfdd46b -r 2e1adbfc62af qtinternetradio/ui/src/ircategoryview.cpp --- a/qtinternetradio/ui/src/ircategoryview.cpp Mon Apr 19 14:01:53 2010 +0300 +++ b/qtinternetradio/ui/src/ircategoryview.cpp Mon May 03 12:25:23 2010 +0300 @@ -343,15 +343,16 @@ { disconnectIsdsClient(); iApplication->closeConnectingDialog(); - if (iWaitDialog) - { - iWaitDialog->close(); - } iListView->reset(); iListView->setCurrentIndex(iModel->index(iLastSelectItem)); iListView->scrollTo(iModel->index(iLastSelectItem)); getViewManager()->activateView(this); + + if (iWaitDialog) + { + iWaitDialog->close(); + } } /* @@ -401,18 +402,16 @@ if (!iWaitDialog) { iWaitDialog = new HbMessageBox(tr(""), HbMessageBox::MessageTypeInformation); - //iWaitDialog->setTimeout(HbPopupBase::NoTimeout); - iWaitDialog->setTimeout(HbPopup::NoTimeout); // JM: changed in w47 Orbit + iWaitDialog->setTimeout(HbPopup::NoTimeout); iWaitDialog->setModal(true); - //iWaitDialog->setDismissPolicy(HbPopupBase::NoDismiss); - iWaitDialog->setDismissPolicy(HbPopup::NoDismiss); // JM: changed in w47 Orbit - HbAction *cancelAction = new HbAction(hbTrId("txt_common_button_cancel"), iWaitDialog); - iWaitDialog->setPrimaryAction(cancelAction); - connect(cancelAction, SIGNAL(triggered()), this, SLOT(cancelRequest())); + iWaitDialog->setDismissPolicy(HbPopup::NoDismiss); + QAction *action = iWaitDialog->actions().at(0); + action->setText(hbTrId("txt_common_button_cancel")); + connect(action, SIGNAL(triggered()), this, SLOT(cancelRequest())); } iWaitDialog->setText(aText); - iWaitDialog->exec(); + iWaitDialog->open(); } void IRCategoryView::connectToIsdsClient() diff -r 09774dfdd46b -r 2e1adbfc62af qtinternetradio/ui/src/irplaycontroller.cpp --- a/qtinternetradio/ui/src/irplaycontroller.cpp Mon Apr 19 14:01:53 2010 +0300 +++ b/qtinternetradio/ui/src/irplaycontroller.cpp Mon May 03 12:25:23 2010 +0300 @@ -17,6 +17,10 @@ #include #include #include +#ifdef Q_CC_NOKIAX86 +#include +#include +#endif #include "irplaycontroller.h" #include "irapplication.h" @@ -30,6 +34,11 @@ #include "irqsettings.h" #include "irqfavoritesdb.h" #include "irqstatisticsreporter.h" + +#ifdef Q_CC_NOKIAX86 +void getRadioServerAddress(QString & aUrl); +#endif + // public functions /* @@ -135,12 +144,13 @@ if (iUrlArray) { QString url = iUrlArray->at(0); -#ifdef __WINS__ +#ifdef Q_CC_NOKIAX86 if (iLastPlayedChannelName != aPreset->name) { emit initializeLogo(); } - url = tr("http://172.28.189.104:8000"); + url = "http://172.28.205.171:8000"; + getRadioServerAddress(url); iLastPlayedChannelName = aPreset->name; #else if (iLastPlayedUrl != iUrlArray->at(0)) @@ -417,8 +427,7 @@ if (iResuming) { - HbMessageBox note(tr("Connecting failed, try next URL"), HbMessageBox::MessageTypeInformation); - note.exec(); + HbMessageBox::information(tr("Connecting failed, try next URL"), (QObject*)NULL, NULL); connectToChannel(iNowPlayingPreset,iConnectedFrom); iResuming = false; return; @@ -565,9 +574,7 @@ */ void IRPlayController::createNote(const QString &aNote) { - HbMessageBox note(aNote, HbMessageBox::MessageTypeWarning); - note.setPrimaryAction(NULL); - note.exec(); + HbMessageBox::warning(aNote, (QObject*)NULL, NULL); } /* @@ -627,8 +634,7 @@ if(tryingContinue) { - HbMessageBox note(tr("Connecting failed, try next URL"), HbMessageBox::MessageTypeInformation); - note.exec(); + HbMessageBox::information(tr("Connecting failed, try next URL"), (QObject*)NULL, NULL); delete iUrlArray; iUrlArray = iNowPlayingPreset->getURLsForBitrate(iTryingBitrate); iLastPlayedUrl = iUrlArray->at(0); @@ -643,9 +649,7 @@ iLastPlayedUrl = iUrlArray->at(0); doPlay(iLastPlayedUrl); - HbMessageBox note(tr("Connecting failed, try next URL"), HbMessageBox::MessageTypeInformation); - note.exec(); - + HbMessageBox::information(tr("Connecting failed, try next URL"), (QObject*)NULL, NULL); return true; } @@ -696,3 +700,32 @@ return iTryingBitrate; } #endif + +//get IP address configuration of test radio server +#ifdef Q_CC_NOKIAX86 +void getRadioServerAddress(QString & aUrl) +{ + QFile file("C:\\data\\QTIRConfigure.txt"); + + if (file.open(QIODevice::ReadOnly)) + { + QTextStream stream(&file); + QString line; + QStringList parameter; + while (!stream.atEnd()) + { + line = stream.readLine(); + parameter = line.split("="); + if (parameter.count() == 2) + { + if (parameter.first() == "RadioServerAddress") + { + aUrl = parameter.last(); + break; + } + } + } + file.close(); + } +} +#endif diff -r 09774dfdd46b -r 2e1adbfc62af qtinternetradio/ui/src/irsonghistoryview.cpp --- a/qtinternetradio/ui/src/irsonghistoryview.cpp Mon Apr 19 14:01:53 2010 +0300 +++ b/qtinternetradio/ui/src/irsonghistoryview.cpp Mon May 03 12:25:23 2010 +0300 @@ -222,14 +222,8 @@ void IRSongHistoryView::showPrompt() { - QString str = hbTrId("txt_irad_info_click_the_song_and_find_it_in_nokia_music_shop"); - HbMessageBox promptDialog(str, HbMessageBox::MessageTypeInformation); - //promptDialog.setTimeout(HbPopupBase::NoTimeout); - promptDialog.setTimeout(HbPopup::NoTimeout); // JM: changed in w47 Orbit - promptDialog.setModal(true); - //promptDialog.setDismissPolicy(HbPopupBase::NoDismiss); - promptDialog.setDismissPolicy(HbPopup::NoDismiss); // JM: changed in w47 Orbit - promptDialog.exec(); + QString str = hbTrId("txt_irad_info_click_the_song_and_find_it_in_nokia_music_store"); + popupNote(str, HbMessageBox::MessageTypeInformation); } void IRSongHistoryView::itemAboutToBeSelected(bool& needNetwork) diff -r 09774dfdd46b -r 2e1adbfc62af qtinternetradio/ui/src/irstationsview.cpp --- a/qtinternetradio/ui/src/irstationsview.cpp Mon Apr 19 14:01:53 2010 +0300 +++ b/qtinternetradio/ui/src/irstationsview.cpp Mon May 03 12:25:23 2010 +0300 @@ -267,10 +267,6 @@ int currentItem = 0; iApplication->closeConnectingDialog(); iConnectTimer->stop(); - if (iWaitDialog) - { - iWaitDialog->close(); - } disconnectIsdsClient(); cleanupResource(); @@ -303,7 +299,11 @@ } } - getViewManager()->activateView(this); + getViewManager()->activateView(this); + if (iWaitDialog) + { + iWaitDialog->close(); + } } /* @@ -543,17 +543,16 @@ if (!iWaitDialog) { iWaitDialog = new HbMessageBox(aStr, HbMessageBox::MessageTypeInformation); - //iWaitDialog->setTimeout(HbPopupBase::NoTimeout); - iWaitDialog->setTimeout(HbPopup::NoTimeout); // JM: changed in w47 Orbit + iWaitDialog->setTimeout(HbPopup::NoTimeout); iWaitDialog->setModal(true); - //iWaitDialog->setDismissPolicy(HbPopupBase::NoDismiss); - iWaitDialog->setDismissPolicy(HbPopup::NoDismiss); // JM: changed in w47 Orbit - HbAction *cancelAction = new HbAction(hbTrId("txt_common_button_cancel"), iWaitDialog); - iWaitDialog->setPrimaryAction(cancelAction); - connect(cancelAction, SIGNAL(triggered()), this, SLOT(cancelRequest())); + iWaitDialog->setDismissPolicy(HbPopup::NoDismiss); + QList actionsList = iWaitDialog->actions(); + QAction *action = actionsList.at(0); + action->setText(hbTrId("txt_common_button_cancel")); + connect(action, SIGNAL(triggered()), this, SLOT(cancelRequest())); } - iWaitDialog->exec(); + iWaitDialog->open(); } void IRStationsView::convertAnother() diff -r 09774dfdd46b -r 2e1adbfc62af qtinternetradio/ui/src/irviewmanager.cpp --- a/qtinternetradio/ui/src/irviewmanager.cpp Mon Apr 19 14:01:53 2010 +0300 +++ b/qtinternetradio/ui/src/irviewmanager.cpp Mon May 03 12:25:23 2010 +0300 @@ -594,10 +594,7 @@ { crossLineReset(); viewport()->repaint(); - HbMessageBox exitNote(hbTrId("txt_common_info_exiting"), - HbMessageBox::MessageTypeInformation); - exitNote.setPrimaryAction(NULL); - exitNote.exec(); + HbMessageBox::information(hbTrId("txt_common_info_exiting"), (QObject*)NULL, NULL); qApp->quit(); iExiting = true; }