FCL/sf/app/videoplayer: comparison videocollection/videocollectionview/src/videolistview.cpp

equal deleted inserted replaced

-:45e72b57a2fd
+:e3cecb93e76a
 *
 * Description:   Videolist view class source code
 *
 */
-// Version : %version: 113 %
+// Version : %version: 113.1.5 %
 // INCLUDE FILES
 #include <xqserviceutil.h>
 #include <qactiongroup.h>
 #include <hbinstance.h>
 #include <hbaction.h>
 #include <hbmenu.h>
 #include <hbgroupbox.h>
 #include <hbpushbutton.h>
 #include <hbinputdialog.h>
+#include <hbparameterlengthlimiter.h>
+#include <hbtoolbarextension.h>
 #include <vcxmyvideosdefs.h>
 #include "videoservices.h"
 #include "videolistselectiondialog.h"
 #include "videocollectionviewutils.h"
 #include "videocollectioncommon.h"
 #include "videocollectionwrapper.h"
 #include "videosortfilterproxymodel.h"
 #include "videocollectionuiloader.h"
 #include "mpxhbvideocommondefs.h"
+#include "videooperatorservice.h"
+#include "videocollectioncenrepdefs.h"
 #include "videocollectiontrace.h"
 // Object names.
 const char* const LIST_VIEW_OBJECT_NAME_OPTIONS_MENU      = "vc::ListViewOptionsMenu";
+const char* const LIST_VIEW_OBJECT_NAME_TOOLBAR_EXTENSION = "vc::ListViewToolbarExtension";
 // ---------------------------------------------------------------------------
 // Constructor
 // ---------------------------------------------------------------------------
 //
 , mHintLevel( VideoHintWidget::AllVideos )
 , mVideoServices( 0 )
 , mCurrentList( 0 )
 , mToolbarViewsActionGroup( 0 )
 , mToolbarCollectionActionGroup( 0 )
+, mToolbarServiceExtension( 0 )
 {
 	FUNC_LOG;
 }
 // ---------------------------------------------------------------------------
 toolBar()->clearActions();
 mToolbarActions.clear();
 mSortingRoles.clear();
+delete mToolbarServiceExtension;
+mToolbarServiceExtension = 0;
 if(mVideoServices)
 {
 	mVideoServices->decreaseReferenceCount();
 	mVideoServices = 0;
 }
+QList<VideoOperatorService *>::const_iterator iter = mVideoOperatorServices.constBegin();
+while(iter != mVideoOperatorServices.constEnd())
+{
+delete *iter;
+iter++;
+}
+mVideoOperatorServices.clear();
 }
 // ---------------------------------------------------------------------------
 // initializeView()
 // ---------------------------------------------------------------------------
 QList<VideoCollectionUiLoaderParam> params;
 params.append(VideoCollectionUiLoaderParam(
 DOCML_NAME_VC_VIDEOLISTWIDGET,
 DOCML_VIDEOCOLLECTIONVIEW_FILE,
+DOCML_VIDEOCOLLECTIONVIEW_SECTION_LIST,
 true,
 videoListPhase));
 params.append(VideoCollectionUiLoaderParam(
 DOCML_NAME_VC_COLLECTIONWIDGET,
 {
 mCurrentList = mUiLoader->findWidget<VideoListWidget>(
 DOCML_NAME_VC_COLLECTIONWIDGET );
 }
 return 0;
 }
 // ---------------------------------------------------------------------------
 // titleReadySlot()
 !connect(
 mCurrentList->getModel()->sourceModel(), SIGNAL(modelChanged()),
 this, SLOT(layoutChangedSlot())) ||
 !connect(
 mCurrentList->getModel()->sourceModel(), SIGNAL(modelReady()),
-this, SLOT(modelReadySlot())))
+this, SLOT(modelReadySlot())) ||
+!connect(
+mCurrentList->getModel()->sourceModel(), SIGNAL(albumListReady()),
+this, SLOT(albumListReadySlot())))
 {
 ERROR(-1, "VideoListView::activateView() failed to connect signals.");
 // deactivate view so we get rid of dangling connections.
 deactivateView();
 err = -1;
 //
 void VideoListView::modelReadySlot()
 {
 	FUNC_LOG;
-	// if mModelReady is false, then it means that this is the first time modelReady
+	// check that current list is all videos or collection content.
-	// signal fires. Signaling that view is ready.
+	VideoCollectionCommon::TCollectionLevels level = mCurrentList->getLevel();
-	if(!mViewReady)
+	if(level != VideoCollectionCommon::ELevelCategory)
 	{
-	    mViewReady = true;
+	    modelReady();
-	    emit viewReady();
 	}
+}
-mModelReady = true;
+// ---------------------------------------------------------------------------
-// since the reset signal arrives after
+// albumListReadySlot
-// layout changed, need to make sure that
+// ---------------------------------------------------------------------------
-// view is updated in case needed
+//
-layoutChangedSlot();
+void VideoListView::albumListReadySlot()
+{
+FUNC_LOG;
+// check that current list is category list.
+VideoCollectionCommon::TCollectionLevels level = mCurrentList->getLevel();
+if(level == VideoCollectionCommon::ELevelCategory)
+{
+modelReady();
+}
 }
 // ---------------------------------------------------------------------------
 // layoutChangedSlot
 // ---------------------------------------------------------------------------
 {
 	FUNC_LOG;
 }
 // ---------------------------------------------------------------------------
+// modelReady()
+// ---------------------------------------------------------------------------
+//
+void VideoListView::modelReady()
+{
+FUNC_LOG;
+// if mViewReady is false, then it means that this is the first time
+// modelReady or albumListReady signal fires. Signaling that view is ready.
+if(!mViewReady)
+{
+mViewReady = true;
+emit viewReady();
+}
+mModelReady = true;
+// since the reset signal arrives after
+// layout changed, need to make sure that
+// view is updated in case needed
+layoutChangedSlot();
+}
+// ---------------------------------------------------------------------------
 // cleanup()
 // ---------------------------------------------------------------------------
 //
 void VideoListView::cleanup()
 {
 mToolbarActions[ETBActionCollections] = createAction("qtg_mono_video_collection",
 mToolbarViewsActionGroup, SLOT(openCollectionViewSlot()));
 if (!mVideoServices)
 {
-			// Services tab
+			// Create services button or toolbar extension depending how many operator
-			mToolbarActions[ETBActionServices] = createAction("qtg_mono_ovistore",
+// services are configured.
-					mToolbarViewsActionGroup, SLOT(openServicesViewSlot()));
+createOperatorServicesToolbar();
 			// Add Videos tab
 			mToolbarActions[ETBActionAddVideos] =
 			        createAction("qtg_mono_add_to_video_collection",
 					mToolbarCollectionActionGroup, SLOT(addVideosToCollectionSlot()));
 HbToolBar *bar = toolBar(); // First call to toolBar() creates the object, so on failure it could return 0.
 if(   !bar
 		   || !mToolbarActions[ETBActionAllVideos]
 || !mToolbarActions[ETBActionCollections]
-|| ( !mVideoServices && (!mToolbarActions[ETBActionServices]
+|| ( !mVideoServices && (!mToolbarActions[ETBActionAddVideos]
-|| !mToolbarActions[ETBActionAddVideos]
+|| !mToolbarActions[ETBActionRemoveVideos])))
-|| !mToolbarActions[ETBActionRemoveVideos])))
 {
 ERROR(-1, "VideoListView::createToolbar() failed to create all actions or the toolbar.");
 	delete mToolbarActions[ETBActionAllVideos];
 delete mToolbarActions[ETBActionCollections];
-delete mToolbarActions[ETBActionServices];
 delete mToolbarActions[ETBActionAddVideos];
 delete mToolbarActions[ETBActionRemoveVideos];
 	return -1;
 }
 // Collection view actions are not checkable
 mToolbarActions[ETBActionAllVideos]->setCheckable(true);
 mToolbarActions[ETBActionCollections]->setCheckable(true);
-if (!mVideoServices)
+if(!mVideoServices && mToolbarActions[ETBActionServices])
 {
 	mToolbarActions[ETBActionServices]->setCheckable(false);
 }
 VideoCollectionCommon::TCollectionLevels level = VideoCollectionCommon::ELevelVideos;
 if(mCurrentList)
 }
 else if(level == VideoCollectionCommon::ELevelAlbum)
 {
 bar->addActions(mToolbarCollectionActionGroup->actions());
 }
+if(mToolbarServiceExtension && (level == VideoCollectionCommon::ELevelCategory
+|| level == VideoCollectionCommon::ELevelVideos))
+{
+HbAction *action = bar->addExtension(mToolbarServiceExtension);
+HbIcon icon("qtg_mono_video_services");
+action->setIcon(icon);
+}
+}
+return 0;
+}
+// ---------------------------------------------------------------------------
+// createOperatorServicesToolbar()
+// ---------------------------------------------------------------------------
+//
+void VideoListView::createOperatorServicesToolbar()
+{
+FUNC_LOG;
+if(mVideoOperatorServices.count() > 0)
+{
+return;
+}
+// Load services.
+loadOperatorService(KVideoCollectionViewCenrepServiceItem1Title, KVideoCollectionViewCenrepServiceItem1ToolbarIconPath,
+KVideoCollectionViewCenrepServiceItem1Url, KVideoCollectionViewCenrepServiceItem1Uid);
+loadOperatorService(KVideoCollectionViewCenrepServiceItem2Title, KVideoCollectionViewCenrepServiceItem2ToolbarIconPath,
+KVideoCollectionViewCenrepServiceItem2Url, KVideoCollectionViewCenrepServiceItem2Uid);
+loadOperatorService(KVideoCollectionViewCenrepServiceItem3Title, KVideoCollectionViewCenrepServiceItem3ToolbarIconPath,
+KVideoCollectionViewCenrepServiceItem3Url, KVideoCollectionViewCenrepServiceItem3Uid);
+loadOperatorService(KVideoCollectionViewCenrepServiceItem4Title, KVideoCollectionViewCenrepServiceItem4ToolbarIconPath,
+KVideoCollectionViewCenrepServiceItem4Url, KVideoCollectionViewCenrepServiceItem4Uid);
+loadOperatorService(KVideoCollectionViewCenrepServiceItem5Title, KVideoCollectionViewCenrepServiceItem5ToolbarIconPath,
+KVideoCollectionViewCenrepServiceItem5Url, KVideoCollectionViewCenrepServiceItem5Uid);
+loadOperatorService(KVideoCollectionViewCenrepServiceItem6Title, KVideoCollectionViewCenrepServiceItem6ToolbarIconPath,
+KVideoCollectionViewCenrepServiceItem6Url, KVideoCollectionViewCenrepServiceItem6Uid);
+// Create toolbar extension when there's multiple services.
+if(mVideoOperatorServices.count() > 1 && !mToolbarServiceExtension)
+{
+mToolbarServiceExtension = new HbToolBarExtension();
+mToolbarServiceExtension->setObjectName(LIST_VIEW_OBJECT_NAME_TOOLBAR_EXTENSION);
-}
+QList<VideoOperatorService *>::const_iterator iter = mVideoOperatorServices.constBegin();
+while(iter != mVideoOperatorServices.constEnd())
-return 0;
+{
+HbIcon icon((*iter)->iconResource());
+HbAction *action = mToolbarServiceExtension->addAction(icon, (*iter)->title(),
+(*iter), SLOT(launchService()));
+action->setObjectName((*iter)->title());
+iter++;
+}
+}
+// Add toolbar button when there's only one service.
+if(mVideoOperatorServices.count() == 1)
+{
+VideoOperatorService *service = mVideoOperatorServices[0];
+mToolbarActions[ETBActionServices] = createAction(service->iconResource(),
+mToolbarViewsActionGroup, 0 /*do not connect to any slot*/);
+connect(mToolbarActions[ETBActionServices], SIGNAL(triggered()), service, SLOT(launchService()));
+}
+}
+// ---------------------------------------------------------------------------
+// loadOperatorService()
+// ---------------------------------------------------------------------------
+//
+void VideoListView::loadOperatorService(int titleKey, int iconKey, int uriKey, int uidKey)
+{
+FUNC_LOG;
+VideoOperatorService *service = new VideoOperatorService();
+if(service->load(titleKey, iconKey, uriKey, uidKey))
+{
+mVideoOperatorServices.append(service);
+}
+else
+{
+// Load failed, delete service data.
+delete service;
+}
 }
 // ---------------------------------------------------------------------------
 // createAction()
 // ---------------------------------------------------------------------------
 HbAction* action = new HbAction(actionGroup);
 HbIcon hbIcon(icon);
 action->setIcon(hbIcon);
-if(!connect(action, SIGNAL(triggered()), this, slot)) {
+if(slot)
-// actiongroup deletion deletes this also.
+{
-// return 0 tells that there was a problem in creation to caller.
+if(!connect(action, SIGNAL(triggered()), this, slot)) {
-delete action;
+// actiongroup deletion deletes this also.
-return 0;
+// return 0 tells that there was a problem in creation to caller.
-}
+delete action;
+return 0;
+}
+}
 return action;
 }
 // ---------------------------------------------------------------------------
 // showHint
 			{
 				subLabel->setHeading(hbTrId("txt_videos_subtitle_ln_collections", itemCount));
 			}
 			else
 			{
-				subLabel->setHeading(hbTrId("txt_videos_subtitle_1_l2").arg(mCollectionName).arg(itemCount));
+				QString text = HbParameterLengthLimiter(hbTrId("txt_videos_subtitle_1_l2")).arg(mCollectionName).arg(itemCount);
+				subLabel->setHeading(text);
 			}
 }
 }
 }
 updateSubLabel();
 }
 }
 // ---------------------------------------------------------------------------
-// openservicesViewSlot()
+// openOperatorServiceSlot()
 // ---------------------------------------------------------------------------
 //
-void VideoListView::openServicesViewSlot()
+void VideoListView::openOperatorServiceSlot()
 {
 	FUNC_LOG;
-debugNotImplementedYet();
+	if(mVideoOperatorServices.count() > 0)
+	{
+	    mVideoOperatorServices[0]->launchService();
+	}
 }
 // ---------------------------------------------------------------------------
 // startSorting()
 // ---------------------------------------------------------------------------
 void VideoListView::collectionOpenedSlot(bool openingCollection,
 const QString& collection,
 const TMPXItemId &collectionId)
 {
 	FUNC_LOG;
-// clear toolbar actions.
+// update / clear collection name
-toolBar()->clearActions();
-VideoListWidget *collectionContentWidget =
-mUiLoader->findWidget<VideoListWidget>(
-DOCML_NAME_VC_COLLECTIONCONTENTWIDGET);
-if(!collectionContentWidget)
-{
-return;
-}
-// update collection specific information
 	mCollectionName = collection;
-	// disable collection content animations during widget change
-	HbAbstractItemView::ItemAnimations animationState = collectionContentWidget->enabledAnimations();
-	collectionContentWidget->setEnabledAnimations(HbAbstractItemView::None);
 	if(openingCollection)
 {
-// open album view
+	    VideoListWidget *collectionContentWidget =
-if (collectionId == TMPXItemId::InvalidId() || mCurrentList == collectionContentWidget)
+	                   mUiLoader->findWidget<VideoListWidget>(
-{
+	                       DOCML_NAME_VC_COLLECTIONCONTENTWIDGET);
-// no currentlist or currentlist is already collection content -list
+// open album view, mCurrentList might be NULL at this point
-collectionContentWidget->setEnabledAnimations(animationState);
+if (!collectionContentWidget || mCurrentList == collectionContentWidget)
+{
+// collection widget cannot be loaded or
+// currentlist is already collection content -list
 return;
 }
 // get level from the item to be opened only default
 // or user defined collections can be activated here
 {
 level = VideoCollectionCommon::ELevelAlbum;
 }
 else
 {
-collectionContentWidget->setEnabledAnimations(animationState);
 return;
 }
-// Start fetching content before changing.
 VideoSortFilterProxyModel *model = collectionContentWidget->getModel();
 if(!model)
 {
 // no model for content widget, cannot activate
-collectionContentWidget->setEnabledAnimations(animationState);
 return;
 }
+// disable collection content animations during widget change
+HbAbstractItemView::ItemAnimations animationState = collectionContentWidget->enabledAnimations();
+collectionContentWidget->setEnabledAnimations(HbAbstractItemView::None);
+// Start fetching content before changing list widget
 model->openItem(collectionId);
 // deactivat current widget.
 if(mCurrentList)
 {
 // activate video collection content widget and set it as current list.
 mCurrentList = collectionContentWidget;
 mCurrentList->activate(level);
 updateSubLabel();
-model->invalidate();
 // update hint widget for correct content
 mModelReady = model->rowCount() > 0;
 setHintLevel(VideoHintWidget::Collection);
-// update toolbar for albums, default categories don't have one.
+// update toolbar for albums, default categories don't have one. Neither does services.
-if(level == VideoCollectionCommon::ELevelAlbum &&
+toolBar()->clearActions();
+if(!mVideoServices && level == VideoCollectionCommon::ELevelAlbum &&
 mToolbarCollectionActionGroup && mToolbarActions.contains(ETBActionCollections))
 {
 mToolbarActions[ETBActionCollections]->setChecked(false);
 toolBar()->addActions(mToolbarCollectionActionGroup->actions());
-}
+setItemVisible(Hb::ToolBarItem, true);
+}
+else
+{
+setItemVisible(Hb::ToolBarItem, false);
+}
+// restore animations for collection content widget
+collectionContentWidget->setEnabledAnimations(animationState);
 }
 else
 {
+// clear actions to make sure there is no wrong toolbar in case main
+// toolbar actiongroup actiongroup is missing
+toolBar()->clearActions();
 // open collection view
 openCollectionViewSlot();
 // update toolbar
 if(mToolbarViewsActionGroup && mToolbarActions.contains(ETBActionCollections))
 {
 toolBar()->addActions(mToolbarViewsActionGroup->actions());
 mToolbarActions[ETBActionCollections]->setChecked(true);
-}
+setItemVisible(Hb::ToolBarItem, true);
-}
-	// restore animations for collection content widget
+if(mToolbarServiceExtension)
-	collectionContentWidget->setEnabledAnimations(animationState);
+{
+HbAction *action = toolBar()->addExtension(mToolbarServiceExtension);
+HbIcon icon("qtg_mono_video_services");
+action->setIcon(icon);
+}
+}
+}
 	if(!mVideoServices)
 	{
 	    // save / clear collection related activity data
 	    VideoCollectionViewUtils::setCollectionActivityData(collectionId, collection);
 	}
 connect(
 object, SIGNAL(aboutToShow()), this, SLOT(aboutToShowMainMenuSlot()));
 }
 else if (name.compare(DOCML_NAME_HINT_BUTTON) == 0)
 {
-connect(object, SIGNAL(clicked(bool)), this, SLOT(openServicesViewSlot()));
+connect(object, SIGNAL(clicked(bool)), this, SLOT(openOperatorServiceSlot()));
 }
 else if (name.compare(DOCML_NAME_SORT_BY_DATE) == 0)
 {
 HbAction *action = qobject_cast<HbAction*>(object);
 if (action)

changeset 52	e3cecb93e76a
parent 47	45e72b57a2fd
child 59	a76e86df7ccd