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

equal deleted inserted replaced

-:5723da102db1
+:38bbf2dcd608
 */
 #include <hblistview.h>
 #include <hbmenu.h>
 #include <hbaction.h>
 #include <hbnotificationdialog.h>
-#include <QPixmap>
-#include <QTimer>
 #include "irviewmanager.h"
 #include "irapplication.h"
 #include "irqisdsclient.h"
 #include "irplaycontroller.h"
 #include "irhistoryview.h"
 #include "irqisdsdatastructure.h"
 #include "irhistorymodel.h"
-#include "irqsonghistoryinfo.h"
 #include "irqnetworkcontroller.h"
-#include "irqutility.h"
 #include "irqenums.h"
 #include "irqfavoritesdb.h"
 #include "irstationdetailsview.h"
 #include "iruidefines.h"
-const int KBitmapSize = 59;
 const QString KActionAddName("Add");
 const QString KActionDeleteName("Delete");
 const QString KActionDetailsName("Details");
 //                                         public functions
 /*
 * Description : constructor
 */
 IRHistoryView::IRHistoryView(IRApplication *aApplication, TIRViewId aViewId) :
-IrAbstractListViewBase(aApplication, aViewId), iClearHistoryAction(NULL),
+IrAbstractListViewBase(aApplication, aViewId), iClearHistoryAction(NULL)
-iLogoPreset(NULL)
 {
 iModel = new IRHistoryModel(this);
 iListView->setModel(iModel);
 iListView->setCurrentIndex(iModel->index(0));
 iClearHistoryAction = new HbAction(hbTrId("txt_irad_opt_clear_list"), menu());
 #else
 iClearHistoryAction = new HbAction(hbTrId("Clear list"), menu());
 #endif
-iConvertTimer = new QTimer(this);
-iConvertTimer->setInterval(10);
 connect(iClearHistoryAction, SIGNAL(triggered()), this, SLOT(popupClearHistoryConfirmMessageBox()));
 connect(iNetworkController, SIGNAL(networkRequestNotified(IRQNetworkEvent)),
 this, SLOT(networkRequestNotified(IRQNetworkEvent)));
 connect(iModel, SIGNAL(modelChanged()), this, SLOT(modelChanged()));
-connect(iConvertTimer, SIGNAL(timeout()), this, SLOT(convertAnother()));
 }
 void IRHistoryView::popupClearHistoryConfirmMessageBox()
 {
 #ifdef SUBTITLE_STR_BY_LOCID
 HbMessageBox::question(hbTrId("txt_irad_info_clear_station_list"), this, SLOT(clearAllList(HbAction*)), HbMessageBox::Ok | HbMessageBox::Cancel);
 /*
 * Description : destructor
 */
 IRHistoryView::~IRHistoryView()
 {
-delete iLogoPreset;
-iLogoPreset = NULL;
 }
 /*
 * Description : virtual functions from base class IRBaseView.
 *               handle view commands
 TIRHandleResult IRHistoryView::handleCommand(TIRViewCommand aCommand,
 TIRViewCommandReason aReason)
 {
 Q_UNUSED(aReason);
 TIRHandleResult ret = IrAbstractListViewBase::handleCommand(aCommand, aReason);
-int leftCount = 0;
 switch (aCommand)
 {
 case EIR_ViewCommand_TOBEACTIVATED:
 showHistory();
 ret = EIR_NoDefault;
 break;
 case EIR_ViewCommand_ACTIVATED:
-connect(iIsdsClient, SIGNAL(presetLogoDownloaded(IRQPreset* )),
+iModel->startDownloadingLogo();
-this, SLOT(presetLogoDownload(IRQPreset* )));
-connect(iIsdsClient, SIGNAL(presetLogoDownloadError()),
-this, SLOT(presetLogoDownloadError()));
-leftCount = iIconIndexArray.count();
-if( leftCount > 0 )
-{
-iConvertTimer->start();
-}
 ret = EIR_NoDefault;
 break;
 case EIR_ViewCommand_DEACTIVATE:
+iModel->stopDownloadingLogo();
-iModel->clearAndDestroyLogos();
-iConvertTimer->stop();
-iIsdsClient->isdsLogoDownCancelTransaction();
-//iIconIndexArray must be cleared, because timer call back convertAnother() might be
-//called after view is deactivated. In that case, iModel->getImgURL(aIndex); will crash
-iIconIndexArray.clear();
-disconnect(iIsdsClient, SIGNAL(presetLogoDownloaded(IRQPreset*)),
-this, SLOT(presetLogoDownload(IRQPreset* )));
-disconnect(iIsdsClient, SIGNAL(presetLogoDownloadError()),
-this, SLOT(presetLogoDownloadError()));
 ret = EIR_NoDefault;
 break;
 default:
 break;
 * Parameters  : aItem : pointer to the clicked item.
 */
 void IRHistoryView::handleItemSelected()
 {
 int index = iListView->currentIndex().row();
-IRQSongHistoryInfo *hisInfo = iModel->getHistoryInfo(index);
+IRQPreset *preset = iModel->getHistoryInfo(index);
-if (NULL == hisInfo)
+if (NULL == preset)
 {
 return;
 }
-IRQPreset preset;
+if (preset->type)
-convertStationHistory2Preset(*hisInfo, preset);
-if (hisInfo->getChannelType())
 {
 // channel from isds server
-iPlayController->connectToChannel(&preset, EIRQHistoryIsds);
+iPlayController->connectToChannel(preset, EIRQHistoryIsds);
 }
 else
 {
 // user defined channel
-iPlayController->connectToChannel(&preset,EIRQHistoryAdhoc);
+iPlayController->connectToChannel(preset,EIRQHistoryAdhoc);
 }
 }
 #ifdef HS_WIDGET_ENABLED
 void IRHistoryView::itemAboutToBeSelected(bool &aNeedNetwork)
 {
 aNeedNetwork =  true;
 int index = iListView->currentIndex().row();
-iPlayController->setConnectingStationName(iModel->getHistoryInfo(index)->getChannelName());
+iPlayController->setConnectingStationName(iModel->getHistoryInfo(index)->nickName);
 }
 #endif
 void IRHistoryView::networkRequestNotified(IRQNetworkEvent aEvent)
 {
 void IRHistoryView::showHistory()
 {
 if (iModel->checkHistoryUpdate())
 {
 iListView->reset();
 iListView->setCurrentIndex(iModel->index(0));
-//because we get all the history refreshed, so clear the icon array.
-iIconIndexArray.clear();
-//initialize the iconindices
-for (int i = 0; i < iModel->rowCount(); ++i)
-{
-if (iModel->getImageUrl(i) != "")
-{
-iIconIndexArray.append(i);
-}
-}
 }
 }
 // ---------------------------------------------------------------------------
 // IRHistoryView::clearAllList()
 HbMessageBox *dialog = static_cast<HbMessageBox*>(sender());
 if (dialog)
 {
 if (aAction == dialog->actions().at(0))
 {
-iIconIndexArray.clear();
+iModel->clearAllHistory();
-iModel->clearAllList();
-iConvertTimer->stop();
-iIsdsClient->isdsLogoDownCancelTransaction();
 iListView->reset();
 }
 }
 }
 if (iModel->rowCount() > 0)
 {
 viewMenu->insertAction(settingAction, iClearHistoryAction);
 }
 }
-void IRHistoryView::startConvert(int aIndex)
-{
-QString url = iModel->getImageUrl(aIndex);
-IRQPreset tempPreset;
-tempPreset.imgUrl = url;
-tempPreset.type = IRQPreset::EIsds;
-iIsdsClient->isdsLogoDownSendRequest(&tempPreset, 0, KBitmapSize, KBitmapSize);
-}
-//if the logo is downloaded ok
-void IRHistoryView::presetLogoDownload(IRQPreset* aPreset)
-{
-if (NULL == aPreset)
-{
-presetLogoDownloadError();
-return;
-}
-delete iLogoPreset;
-iLogoPreset = aPreset;
-if (iLogoPreset->logoData.size() > 0)
-{
-QPixmap tempMap;
-bool ret = tempMap.loadFromData((const unsigned char*)iLogoPreset->logoData.constData(), iLogoPreset->logoData.size());
-if( ret )
-{
-QIcon convertIcon(tempMap);
-HbIcon *hbIcon = new HbIcon(convertIcon);
-int index = iIconIndexArray[0];
-iModel->setLogo(hbIcon, index);
-iIconIndexArray.removeAt(0);
-int leftCount = iIconIndexArray.count();
-if( leftCount > 0 )
-{
-iConvertTimer->start();
-}
-return;
-}
-}
-presetLogoDownloadError();
-}
-//if the logo download fails
-void IRHistoryView::presetLogoDownloadError()
-{
-// if the logo download fails, try to download the next
-iIconIndexArray.removeAt(0);
-int leftCount = 0;
-leftCount = iIconIndexArray.count();
-if( leftCount > 0 )
-{
-iConvertTimer->start();
-}
-}
-void IRHistoryView::convertAnother()
-{
-iConvertTimer->stop();
-int leftCount = iIconIndexArray.count();
-if (0 != leftCount)
-{
-startConvert(iIconIndexArray[0]);
-}
-}
 void IRHistoryView::modelChanged()
 {
 #ifdef SUBTITLE_STR_BY_LOCID
 QString headingStr = hbTrId("txt_irad_subtitle_recently_played_stations") + " (" + QString::number(iModel->rowCount()) + ")";
 }
 void IRHistoryView::addContextAction()
 {
 QModelIndex current = iListView->currentIndex();
-IRQSongHistoryInfo * currentInfo = iModel->getHistoryInfo(current.row());
+IRQPreset * preset = iModel->getHistoryInfo(current.row());
-IRQPreset preset;
+int retValue = iFavorites->addPreset(*preset);
-convertStationHistory2Preset(*currentInfo, preset);
-int retValue = iFavorites->addPreset(preset);
 HbNotificationDialog *add2FavNote = new HbNotificationDialog();
 add2FavNote->setModal(true);
 add2FavNote->setTimeout(HbPopup::ConfirmationNoteTimeout);
 add2FavNote->setAttribute(Qt::WA_DeleteOnClose);
 }
 void IRHistoryView::deleteContextAction()
 {
 int current = iListView->currentIndex().row();
-bool ret = iModel->deleteOneItem(current);
+bool ret = iModel->deleteHistory(current);
 if( !ret )
 	  {
 #ifdef SUBTITLE_STR_BY_LOCID
 	    popupNote(hbTrId("txt_irad_info_operation_failed"), HbMessageBox::MessageTypeWarning);
 #else
 	  }
 }
 void IRHistoryView::detailsContextAction()
 {
 int selectedItemIndex = iListView->currentIndex().row();
-IRQSongHistoryInfo *channelDetailInfo = iModel->getHistoryInfo(selectedItemIndex);
+IRQPreset *channelPreset = iModel->getHistoryInfo(selectedItemIndex);
-IRQPreset channelPreset;
-convertStationHistory2Preset(*channelDetailInfo, channelPreset);
 IRStationDetailsView *stationDetailsView = static_cast<IRStationDetailsView*>(getViewManager()->getView(EIRView_StationDetailsView, true));
-stationDetailsView->setDetails(&channelPreset);
+stationDetailsView->setDetails(channelPreset);
 getViewManager()->activateView(EIRView_StationDetailsView);
 }
 void IRHistoryView::listViewLongPressed(HbAbstractViewItem *aItem, const QPointF& aCoords)
 contextMenu->setPreferredPos(aCoords);
 contextMenu->open();
 }
-void IRHistoryView::convertStationHistory2Preset(const IRQSongHistoryInfo& aHistoryInfo, IRQPreset& aPreset)
-{
-IRQChannelServerURL url;
-url.serverName = aHistoryInfo.getChannelName();
-url.url = aHistoryInfo.getStreamUrl();
-url.bitrate = aHistoryInfo.getBitrate();
-aPreset.name = aHistoryInfo.getChannelName();
-aPreset.insertChannelServer(url);
-aPreset.type = aHistoryInfo.getChannelType();
-aPreset.presetId = aHistoryInfo.getChannelId();
-aPreset.shortDesc = aHistoryInfo.getChannelDesc();
-aPreset.imgUrl = aHistoryInfo.getImageUrl();
-aPreset.genreName = aHistoryInfo.getGenreName();
-aPreset.countryName = aHistoryInfo.getCountryName();
-aPreset.languageName = aHistoryInfo.getLanguageName();
-aPreset.description = aHistoryInfo.getChannelDesc();
-aPreset.musicStoreStatus = aHistoryInfo.getMusicStoreStatus();
-}

changeset 17	38bbf2dcd608
parent 16	5723da102db1