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

equal deleted inserted replaced

-:2e1adbfc62af
+:ee64f059b8e1
 #include <hbmenu.h>
 #include <hbaction.h>
 #include <QPixmap>
 #include <QTimer>
-#include "irabstractviewmanager.h"
+#include "irviewmanager.h"
 #include "irapplication.h"
 #include "irqisdsclient.h"
 #include "irplaycontroller.h"
 #include "irhistoryview.h"
 #include "irqisdsdatastructure.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),
 iLogoPreset(NULL)
 {
+//this view won't be starting view, don't need lazy init
+IrAbstractListViewBase::lazyInit();
+setInitCompleted(true);
 iModel = new IRHistoryModel(this);
 iListView->setModel(iModel);
 iListView->setCurrentIndex(iModel->index(0));
 iClearHistoryAction = new HbAction(hbTrId("txt_irad_opt_clear_station_history"), menu());
-iSongHistoryAction = new HbAction(hbTrId("txt_irad_opt_recently_played_songs"), menu());
-menu()->insertAction(iOpenWebAddressAction, iSongHistoryAction);
 iConvertTimer = new QTimer(this);
 iConvertTimer->setInterval(10);
 connect(iClearHistoryAction, SIGNAL(triggered()), this, SLOT(clearAllList()));
 connect(iNetworkController, SIGNAL(networkRequestNotified(IRQNetworkEvent)),
 this, SLOT(networkRequestNotified(IRQNetworkEvent)));
 connect(iModel, SIGNAL(modelChanged()), this, SLOT(modelChanged()));
-connect(iSongHistoryAction, SIGNAL(triggered()), this, SLOT(gotoSongHistory()));
 connect(iConvertTimer, SIGNAL(timeout()), this, SLOT(convertAnother()));
 }
 void IRHistoryView::gotoSongHistory()
 {
 this, SLOT(presetLogoDownload(IRQPreset* )));
 connect(iIsdsClient, SIGNAL(presetLogoDownloadError()),
 this, SLOT(presetLogoDownloadError()));
 showHistory();
+leftCount = iIconIndexArray.count();
+if( leftCount > 0 )
+{
+iConvertTimer->start();
+}
 ret = EIR_NoDefault;
 break;
 case EIR_ViewCommand_DEACTIVATE:
 this, SLOT(presetLogoDownload(IRQPreset* )));
 disconnect(iIsdsClient, SIGNAL(presetLogoDownloadError()),
 this, SLOT(presetLogoDownloadError()));
 ret = EIR_NoDefault;
 break;
-case EIR_ViewCommand_EffectFinished:
-/* when the effect is finished, we start showing the logos  */
-leftCount = iIconIndexArray.count();
-if( leftCount > 0 )
-{
-iConvertTimer->start();
-}
-break;
 default:
 break;
 }
 iIconIndexArray.clear();
 iModel->clearAllList();
 iConvertTimer->stop();
 iIsdsClient->isdsLogoDownCancelTransaction();
 iListView->reset();
-updateView();
 }
 void IRHistoryView::prepareMenu()
 {
 HbMenu *viewMenu = menu();
 viewMenu->removeAction(iClearHistoryAction);
+HbAction * settingAction = qobject_cast<HbAction *>(iLoader.findObject(SETTINGS_ACTION));
 if (iModel->rowCount() > 0)
 {
-viewMenu->insertAction(iOpenWebAddressAction, iClearHistoryAction);
+viewMenu->insertAction(settingAction, iClearHistoryAction);
 }
 }
 void IRHistoryView::startConvert(int aIndex)
 {
 {
 QString headingStr = hbTrId("Station History") + " (" + QString::number(iModel->rowCount()) + ")";
 setHeadingText(headingStr);
 }
+void IRHistoryView::actionClicked(HbAction *aAction)
+{
+if ( aAction )
+{
+QString objectName = aAction->objectName();
+if ( objectName == KActionAddName )
+{
+addContextAction();
+}
+else if( objectName == KActionDeleteName)
+{
+deleteContextAction();
+}
+else if( objectName == KActionDetailsName)
+{
+detailContextAction();
+}
+}
+}
 void IRHistoryView::addContextAction()
 {
 QModelIndex current = iListView->currentIndex();
 IRQSongHistoryInfo * currentInfo = iModel->getHistoryInfo(current.row());
 IRQPreset preset;
 if( !ret )
 	  {
 	    popupNote(hbTrId("txt_irad_info_operation_failed"), HbMessageBox::MessageTypeWarning);
 	  }
 }
+void IRHistoryView::detailContextAction()
+{
+getViewManager()->activateView(EIRView_StationDetailsView);
+IRStationDetailsView *channelHistoryView = static_cast<IRStationDetailsView*>(getViewManager()->getView(EIRView_StationDetailsView));
+int selectedItemIndex = iListView->currentIndex().row();
+IRQSongHistoryInfo *channelDetailInfo = iModel->getHistoryInfo(selectedItemIndex);
+channelHistoryView->setDetails(channelDetailInfo);
+}
 void IRHistoryView::listViewLongPressed(HbAbstractViewItem *aItem, const QPointF& aCoords)
 {
 Q_UNUSED(aItem);
-HbMenu *contextMenu = 0;
+Q_UNUSED(aCoords);
-HbAction *action = 0;
+HbAction *action = NULL;
-contextMenu = new HbMenu();
+HbMenu *contextMenu = new HbMenu;
-action = contextMenu->addAction(QString(hbTrId("txt_irad_menu_add_to_favorite")));
+contextMenu->setAttribute(Qt::WA_DeleteOnClose);
-action->setObjectName("add");
+connect(contextMenu, SIGNAL(triggered(HbAction*)), this, SLOT(actionClicked(HbAction*)));
-action = contextMenu->addAction(QString(hbTrId("txt_common_menu_delete")));
-action->setObjectName("delete");
+action = contextMenu->addAction(hbTrId("txt_irad_menu_add_to_favorite"));
-action = contextMenu->exec(aCoords);
+action->setObjectName(KActionAddName);
+action = contextMenu->addAction(hbTrId("txt_common_menu_delete"));
-if( action )
+action->setObjectName(KActionDeleteName);
-{
+action = contextMenu->addAction(hbTrId("txt_common_menu_details"));
-QString objectName = action->objectName();
+action->setObjectName(KActionDetailsName);
-if ( objectName == "add" )
-{
+contextMenu->open();
-addContextAction();
+}
-}
-else if( objectName == "delete")
-{
-deleteContextAction();
-}
-}
-}
 void IRHistoryView::convertStationHistory2Preset(const IRQSongHistoryInfo& aHistoryInfo, IRQPreset& aPreset)
 {
 IRQChannelServerURL url;
 url.url = aHistoryInfo.getStreamUrl();

changeset 3	ee64f059b8e1
parent 0	09774dfdd46b
child 5	0930554dc389