FCL/sf/app/internetradio: comparison qtinternetradio/ui/src/irsearchchannelsview.cpp

equal deleted inserted replaced

-:0930554dc389
+:3b03c28289e6
 #include <qtimer.h>
 #include <hblistview.h>
 #include <hbsearchpanel.h>
 #include <hbaction.h>
 #include <hbprogressdialog.h>
 #include <hbscrollbar.h>
+#include <hbiconitem.h>
+#include <hbiconanimator.h>
+#include <hblabel.h>
+#include <hbiconanimationmanager.h>
 #include "irsearchchannelsview.h"
 #include "iruidefines.h"
 #include "irqisdsclient.h"
 #include "irapplication.h"
 #include "irqnetworkcontroller.h"
 #include "irchannelmodel.h"
 #include "irqisdsdatastructure.h"
 #include "irplaycontroller.h"
 const uint KBitmapSize = 59;
 IRSearchChannelsView::IRSearchChannelsView(IRApplication* aApplication,
 TIRViewId aViewId): IRBaseView(aApplication, aViewId),
-iListView(NULL),iSearchPanelWidget(NULL),
+iListView(NULL),iSearchPanelWidget(NULL),iSearchState(ESearch_init),
-iSearchState(ESearch_init),iChannelModel(NULL),iSearchingDialog(NULL),
+iChannelModel(NULL),iPreset(NULL),iLogoPreset(NULL),
-iPreset(NULL),iLogoPreset(NULL),iConvertTimer(NULL)
+iConvertTimer(NULL)
 {
 //if this view is not starting view, finish all initialization in constructor
 if (getViewManager()->views().count() > 0)
 {
 if (!initCompleted())
 iConvertTimer->setInterval(10);
 connect(iConvertTimer, SIGNAL(timeout()), this, SLOT(convertAnother()));
 }
 IRSearchChannelsView::~IRSearchChannelsView()
 {
-if( iSearchingDialog != NULL )
-{
-iSearchingDialog->close();
-delete iSearchingDialog;
-iSearchingDialog = NULL;
-}
 if( iPreset != NULL )
 {
 delete iPreset;
 iPreset = NULL;
 }
 if( iLogoPreset != NULL )
 {
 delete iLogoPreset;
 iLogoPreset = NULL;
 }
+if( NULL != iChannelModel )
+{
+iChannelModel->save2Cache();
+}
 }
 void IRSearchChannelsView::loadLayout()
 {
 // Create widget hierarchy
 scrollbar->setVisible(true);
 scrollbar->setInteractive(true);
 iListView->setVerticalScrollBarPolicy(HbScrollArea::ScrollBarAsNeeded);
 iChannelModel = new IrChannelModel(this);
-iListView->setModel(iChannelModel);
+iChannelModel->initWithCache();
+iListView->setModel(iChannelModel);
 }
 void IRSearchChannelsView::connectWidget()
 {
 connect(iListView, SIGNAL(activated(const QModelIndex&)), this, SLOT(clickItem(const QModelIndex&)));
 connect(iChannelModel, SIGNAL(dataAvailable()), this, SLOT(dataChanged()));
 connect(iNetworkController, SIGNAL(networkRequestNotified(IRQNetworkEvent)), this, SLOT(networkRequestNotified(IRQNetworkEvent)));
 connect(iSearchPanelWidget,SIGNAL(criteriaChanged(const QString&)),this,SLOT(searchTextAlready(const QString&)));
+connect(iSearchPanelWidget, SIGNAL(exitClicked()), this, SLOT(minimizeSearchPanel()));
 }
 void IRSearchChannelsView::connectIsdsClient()
 {
 connect(iIsdsClient, SIGNAL(channelItemsChanged(QList<IRQChannelItem *> *)),
 disconnect(iIsdsClient, SIGNAL(presetLogoDownloadError()),
 this, SLOT(presetLogoDownloadError()));
 }
 void IRSearchChannelsView::switch2InitState()
 {
-iLoader.load(SEARCH_CHANNELS_VIEW_LAYOUT_FILENAME,SEARCH_CHANNELS_VIEW_NO_LISTVIEW_SECTION);
 iSearchState = ESearch_init;
-}
+iApplication->stopLoadingAnimation();
+}
-void IRSearchChannelsView::switch2SearchedState()
-{
+void IRSearchChannelsView::switch2LoadingState()
-iSearchState = ESearch_Searched;
+{
-}
-void IRSearchChannelsView::switch2SearchingState()
-{
-iLoader.load(SEARCH_CHANNELS_VIEW_LAYOUT_FILENAME,SEARCH_CHANNELS_VIEW_LISTVIEW_SECTION);
 iSearchPanelWidget->clearFocus();
 iListView->setFocus();
-iSearchState = ESearch_Searching;
+iSearchState = ESearch_Loading;
-startSearchingAnimation();
-}
+QSizeF searchPanelSize = iSearchPanelWidget->size();
+QSizeF windowSize = getViewManager()->size();
-void IRSearchChannelsView::createSearchingDialog()
+QPointF pos(windowSize.width()/2,(windowSize.height() - searchPanelSize.height())/2);
-{
+QPointF iconPos(LOADING_ANIMATION_ICON_SIZE/2, LOADING_ANIMATION_ICON_SIZE/2);
-if ( NULL == iSearchingDialog)
+pos -= iconPos;
-{
+iApplication->startLoadingAnimation(pos);
-//needs to add this , otherwise memory leak
+}
-iSearchingDialog = new HbProgressDialog(HbProgressDialog::WaitDialog);
-iSearchingDialog->setModal(true);
-iSearchingDialog->setTimeout(HbPopup::NoTimeout);
-QAction *cancelAction = iSearchingDialog->actions().at(0);
-cancelAction->setText(hbTrId("txt_common_button_cancel"));
-connect(cancelAction, SIGNAL(triggered()), this, SLOT(cancelRequest()));
-}
-iSearchingDialog->setText(hbTrId("txt_common_info_searching"));
-iSearchingDialog->show();
-}
-void IRSearchChannelsView::closeSearchingDialog()
-{
-if( iSearchingDialog )
-{
-iSearchingDialog->close();
-iSearchingDialog->deleteLater();
-iSearchingDialog = NULL;
-}
-}
-void IRSearchChannelsView::startSearchingAnimation()
-{
-}
-void IRSearchChannelsView::stopSearchingAnimation()
-{
-}
 void IRSearchChannelsView::handleItemSelected()
 {
 if (iListView)
 {
 int index = iListView->currentIndex().row();
-if (index != -1)
+IRQChannelItem* aItem = iChannelModel->getChannelItemByIndex(index);
+if( NULL != aItem )
 {
-if (iIsdsClient)
+iIsdsClient->isdsListenRequest(aItem->channelID,true);
-{
+}
-//once an item is selected, we show a dialog to prevent user from clicking the
+}
-//item again
-iApplication->createLoadingDialog(this, SLOT(cancelRequest()));
-if (iIsdsClient->isdsIsChannelBanner())
-{
-iIsdsClient->isdsListenRequest(index + 1);
-}
-else
-{
-iIsdsClient->isdsListenRequest(index);
-}
-}
-}
-}
 }
 void IRSearchChannelsView::cancelRequest()
 {
-iSearchState = ESearch_init;
 iIsdsClient->isdsCancelRequest();
-stopSearchingAnimation();
+switch2InitState();
-//the following will remove into the stopSearchingAnimation() function
-closeSearchingDialog();
 }
 void IRSearchChannelsView::networkRequestNotified(IRQNetworkEvent aEvent)
 {
 if (getViewManager()->currentView() != this)
 case EIRQNetworkConnectionEstablished:
 if(EIR_UseNetwork_StartSearch == getUseNetworkReason())
 {
 Q_ASSERT( !iKeyText.isEmpty() );
 iIsdsClient->isdsSearchRequest(iKeyText);
-iApplication->createLoadingDialog(this, SLOT(cancelRequest()));
 }
 else if( EIR_UseNetwork_SelectItem == getUseNetworkReason() )
 {
 handleItemSelected();
 }
 setUseNetworkReason(EIR_UseNetwork_NoReason);
 break;
 default:
-stopSearchingAnimation();
+switch2InitState();
-//the following will remove into the stopSearchingAnimation() function
+setUseNetworkReason(EIR_UseNetwork_NoReason);
-closeSearchingDialog();
-setUseNetworkReason(EIR_UseNetwork_NoReason);
-iSearchState = ESearch_init;
 break;
 }
 }
 void IRSearchChannelsView::searchTextAlready(const QString& aSearchCriteria)
 {
 //show some error info here to let user input some criteria
 return;
 }
 setUseNetworkReason(EIR_UseNetwork_StartSearch);
-if (false == iApplication->verifyNetworkConnectivity(hbTrId("txt_common_info_searching")))
+if (false == iApplication->verifyNetworkConnectivity())
 {
-switch2SearchingState();
+switch2LoadingState();
 return;
 }
+//if previouse request is in progress, cancel it
+if( ESearch_Loading == iSearchState )
+{
+iIsdsClient->isdsCancelRequest();
+iConvertTimer->stop();
+iIsdsClient->isdsLogoDownCancelTransaction();
+}
 setUseNetworkReason(EIR_UseNetwork_NoReason);
-switch2SearchingState();
+switch2LoadingState();
 iIsdsClient->isdsSearchRequest(iKeyText);
-createSearchingDialog();
 }
 void IRSearchChannelsView::operationException(IRQError aError)
 {
-iApplication->closeLoadingDialog();
+switch2InitState();
-closeSearchingDialog();
-stopSearchingAnimation();
+QString errStr;
-iSearchState = ESearch_init;
-QString errStr;
 switch(aError)
 {
 case EIRQErrorNotFound:
 errStr = hbTrId("txt_irad_info_no_matching_stations_found");
 break;
 default:
 errStr = hbTrId("txt_irad_info_failed_to_connect");
 break;
 }
 popupNote(errStr, HbMessageBox::MessageTypeWarning);
 }
 void IRSearchChannelsView::clickItem(const QModelIndex&)
 {
 setUseNetworkReason(EIR_UseNetwork_SelectItem);
 if (false == iApplication->verifyNetworkConnectivity())
 {
+switch2LoadingState();
 return;
 }
 setUseNetworkReason(EIR_UseNetwork_NoReason);
+switch2LoadingState();
 handleItemSelected();
 }
 void IRSearchChannelsView::presetResponse(IRQPreset *aPreset)
 }
 }
 void IRSearchChannelsView::dataChanged()
 {
-iApplication->closeLoadingDialog();
+switch2InitState();
-stopSearchingAnimation();
-//the following will remove into the stopSearchingAnimation() function
-closeSearchingDialog();
-switch2SearchedState();
 iListView->reset();
 iListView->setCurrentIndex(iChannelModel->index(0));
 iListView->scrollTo(iChannelModel->index(0));
 //we move the focus to the listview and the search panel will
 if( iIconIndexArray.count() > 0 )
 {
 iConvertTimer->start();
 }
+iSearchPanelWidget->setPlaceholderText(iKeyText);
 }
 void IRSearchChannelsView::startConvert(int aIndex)
 {
 QString url = iChannelModel->imageUrl(aIndex);
 {
 iConvertTimer->start();
 }
 }
-TIRHandleResult IRSearchChannelsView::handleCommand(TIRViewCommand aCommand, TIRViewCommandReason aReason)
+void IRSearchChannelsView::minimizeSearchPanel()
+{
+if( ESearch_Loading == iSearchState )
+{
+if( ! ( iPlayController->isStopped() || iPlayController->isIdle() ) )
+{
+//cancel buffering
+iPlayController->cancelBuffering();
+}
+disconnectIsdsClient();
+iIsdsClient->isdsCancelRequest();
+iConvertTimer->stop();
+iIsdsClient->isdsLogoDownCancelTransaction();
+switch2InitState();
+}
+int count = iChannelModel->rowCount();
+if (0 == count)
+{
+iSearchPanelWidget->clearFocus();
+iListView->setFocus();
+getViewManager()->backToPreviousView();
+}
+else
+{
+iSearchPanelWidget->clearFocus();
+iListView->setFocus();
+}
+}
+TIRHandleResult IRSearchChannelsView::handleCommand(TIRViewCommand aCommand,
+TIRViewCommandReason aReason)
 {
 TIRHandleResult ret = IRBaseView::handleCommand(aCommand, aReason);
 switch (aCommand)
 {
 case EIR_ViewCommand_ACTIVATED:
-//wether to start logo downloading when activated needs more discussing and testing, future.
+iIconIndexArray.clear();
-iIconIndexArray.clear();
+iListView->clearFocus();
-connectIsdsClient();
+iSearchPanelWidget->setFocus();
+connectIsdsClient();
 break;
 case EIR_ViewCommand_DEACTIVATE:
 disconnectIsdsClient();
 iIsdsClient->isdsCancelRequest();
 iConvertTimer->stop();
 iIsdsClient->isdsLogoDownCancelTransaction();
+switch2InitState();
 break;
 default:
 break;
 }

changeset 8	3b03c28289e6
parent 5	0930554dc389
child 11	f683e24efca3