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

equal deleted inserted replaced

-:13331705e488
+:229f037ce963
 *
 * Description:   Videolist view class source code
 *
 */
-// Version : %version: 110 %
+// Version : %version: 113 %
 // INCLUDE FILES
 #include <xqserviceutil.h>
 #include <qactiongroup.h>
 #include <hbinstance.h>
 VideoListView::VideoListView( VideoCollectionUiLoader *uiLoader, QGraphicsItem *parent )
 : HbView( parent )
 , mUiUtils( VideoCollectionViewUtils::instance() )
 , mWrapper( VideoCollectionWrapper::instance() )
 , mUiLoader( uiLoader )
-, mIsService( false )
 , mModelReady( false )
 , mViewReady( false )
 , mHintLevel( VideoHintWidget::AllVideos )
 , mVideoServices( 0 )
 , mCurrentList( 0 )
 	if(!mUiLoader)
 	{
 cleanup();
 		return -1;
 	}
+	int videoListPhase = VideoCollectionUiLoaderParam::LoadPhasePrimary;
-if (XQServiceUtil::isService() && !mVideoServices)
+	int collectionListPhase = VideoCollectionUiLoaderParam::LoadPhaseSecondary;
-{
+	int collectionContentListPhase = VideoCollectionUiLoaderParam::LoadPhaseSecondary;
-INFO("VideoListView::initializeView() service flag set to true.");
+	VideoCollectionCommon::TCollectionLevels level = VideoCollectionCommon::ELevelVideos;
-mIsService = true;
+if (XQServiceUtil::isService())
+{
-	mVideoServices = VideoServices::instance();
+INFO("VideoListView::initializeView() initializing service.");
 	if (!mVideoServices)
 {
-	    ERROR(-1, "VideoListView::initializeView() getting services instance failed.");
+	    mVideoServices = VideoServices::instance();
-cleanup();
+	    connect(mVideoServices, SIGNAL(titleReady(const QString&)),
-	return -1;
+	            this, SLOT(titleReadySlot(const QString&)));
 		}
-else
-{
-	connect(mVideoServices, SIGNAL(titleReady(const QString&)), this, SLOT(titleReadySlot(const QString&)));
-}
 	}
+else
+{
+if(mVideoServices)
+{
+disconnect(mVideoServices, SIGNAL(titleReady(const QString&)),
+this, SLOT(titleReadySlot(const QString&)));
+mVideoServices->decreaseReferenceCount();
+mVideoServices = 0;
+}
+VideoCollectionViewUtils::getActivityWidgetLevel(level);
+if(level == VideoCollectionCommon::ELevelCategory)
+{
+videoListPhase = VideoCollectionUiLoaderParam::LoadPhaseSecondary;
+collectionListPhase = VideoCollectionUiLoaderParam::LoadPhasePrimary;
+collectionContentListPhase = VideoCollectionUiLoaderParam::LoadPhaseSecondary;
+}
+else if(level == VideoCollectionCommon::ELevelDefaultColl ||
+level == VideoCollectionCommon::ELevelAlbum)
+{
+videoListPhase = VideoCollectionUiLoaderParam::LoadPhaseSecondary;
+collectionListPhase = VideoCollectionUiLoaderParam::LoadPhasePrimary;
+collectionContentListPhase = VideoCollectionUiLoaderParam::LoadPhasePrimary;
+}
+}
+// start loading objects and widgets
 QList<VideoCollectionUiLoaderParam> params;
-int videoListPhase = VideoCollectionUiLoaderParam::LoadPhasePrimary;
-int collectionListPhase = VideoCollectionUiLoaderParam::LoadPhaseSecondary;
+params.append(VideoCollectionUiLoaderParam(
+DOCML_NAME_VC_VIDEOLISTWIDGET,
-if(VideoCollectionViewUtils::loadWidgetLevel() == VideoCollectionCommon::ELevelCategory)
+DOCML_VIDEOCOLLECTIONVIEW_FILE,
-{
+true,
-videoListPhase = VideoCollectionUiLoaderParam::LoadPhaseSecondary;
+videoListPhase));
-collectionListPhase = VideoCollectionUiLoaderParam::LoadPhasePrimary;
+params.append(VideoCollectionUiLoaderParam(
+DOCML_NAME_VC_COLLECTIONWIDGET,
-}
+DOCML_VIDEOCOLLECTIONVIEW_FILE,
-// start loading objects and widgets
+DOCML_VIDEOCOLLECTIONVIEW_SECTION_LIST,
-params.append(VideoCollectionUiLoaderParam(
+true,
-DOCML_NAME_VC_VIDEOLISTWIDGET,
+collectionListPhase));
-DOCML_VIDEOCOLLECTIONVIEW_FILE,
-true,
+params.append(VideoCollectionUiLoaderParam(
-videoListPhase));
+DOCML_NAME_VC_COLLECTIONCONTENTWIDGET,
-params.append(VideoCollectionUiLoaderParam(
+DOCML_VIDEOCOLLECTIONVIEW_FILE,
-DOCML_NAME_VC_COLLECTIONWIDGET,
+DOCML_VIDEOCOLLECTIONVIEW_SECTION_LIST,
-DOCML_VIDEOCOLLECTIONVIEW_FILE,
+true,
-DOCML_VIDEOCOLLECTIONVIEW_SECTION_LIST,
+collectionContentListPhase));
-true,
-collectionListPhase));
 params.append(VideoCollectionUiLoaderParam(
 DOCML_NAME_OPTIONS_MENU,
 DOCML_VIDEOCOLLECTIONVIEW_FILE,
 true,
 VideoCollectionUiLoaderParam::LoadPhasePrimary));
 VideoCollectionUiLoaderParam::LoadPhaseSecondary));
 params.append(VideoCollectionUiLoaderParam(
 DOCML_NAME_SORT_BY_SIZE,
 DOCML_VIDEOCOLLECTIONVIEW_FILE,
 false,
 VideoCollectionUiLoaderParam::LoadPhaseSecondary));
-params.append(VideoCollectionUiLoaderParam(
-DOCML_NAME_VC_COLLECTIONCONTENTWIDGET,
-DOCML_VIDEOCOLLECTIONVIEW_FILE,
-DOCML_VIDEOCOLLECTIONVIEW_SECTION_LIST,
-true,
-VideoCollectionUiLoaderParam::LoadPhaseSecondary)); // widget
 params.append(VideoCollectionUiLoaderParam(
 DOCML_NAME_DIALOG,
 DOCML_VIDEOSELECTIONDIALOG_FILE,
 true,
 VideoCollectionUiLoaderParam::LoadPhaseSecondary));
 this,
 SLOT(objectReadySlot(QObject*, const QString&)));
 mUiLoader->loadPhase(VideoCollectionUiLoaderParam::LoadPhasePrimary);
 params.clear();
+// fetch current list right away for main views
+// for default and user defined collections, currentList
+// will be setted during activation
 if(videoListPhase == VideoCollectionUiLoaderParam::LoadPhasePrimary)
 {
 mCurrentList = mUiLoader->findWidget<VideoListWidget>(
-DOCML_NAME_VC_VIDEOLISTWIDGET);
+DOCML_NAME_VC_VIDEOLISTWIDGET );
 }
 else
 {
 mCurrentList = mUiLoader->findWidget<VideoListWidget>(
-DOCML_NAME_VC_COLLECTIONWIDGET);
+DOCML_NAME_VC_COLLECTIONWIDGET );
 }
 return 0;
 }
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // activateView()
 // ---------------------------------------------------------------------------
 //
-int VideoListView::activateView(const TMPXItemId &itemId)
+int VideoListView::activateView( TMPXItemId &itemId)
 {
 	FUNC_LOG;
-int err = 0;
+int err = -1;
 // activate collection to correct view
 if (itemId == TMPXItemId::InvalidId())
 {
-err = activateVideosView();
-}
+VideoCollectionCommon::TCollectionLevels level = VideoCollectionCommon::ELevelVideos;
-else
+if(!mVideoServices)
+{
+VideoCollectionViewUtils::getActivityWidgetLevel(level);
+}
+if(level == VideoCollectionCommon::ELevelCategory ||
+level == VideoCollectionCommon::ELevelVideos)
+{
+err = activateMainView();
+}
+else if(level == VideoCollectionCommon::ELevelDefaultColl ||
+level == VideoCollectionCommon::ELevelAlbum)
+{
+// level is default or user defined collection
+// see if we have item id
+VideoCollectionViewUtils::getCollectionActivityData(itemId, mCollectionName);
+}
+}
+if(itemId != TMPXItemId::InvalidId())
 {
 err = activateCollectionContentView(itemId);
 }
+if(!err)
+{
+err = createToolbar();
+}
 // connect signals if everything went ok
-if (err == 0)
+if (!err)
 {
 HbMainWindow *mainWnd = hbInstance->allMainWindows().value(0);
 mainWnd->setOrientation(Qt::Vertical, false);
 if (!connect(
 mainWnd, SIGNAL(aboutToChangeOrientation()),
 // deactivate view so we get rid of dangling connections.
 deactivateView();
 err = -1;
 }
 }
+else
+{
+deactivateView();
+}
 return err;
 }
 // ---------------------------------------------------------------------------
 disconnect(mCurrentList->getModel()->sourceModel(),
 SIGNAL(modelReady()),
 this, SLOT(modelReadySlot()));
 showHint(false);
-}
+if(!mVideoServices)
+{
-if(mCurrentList)
+VideoCollectionCommon::TCollectionLevels level = mCurrentList->getLevel();
-{
+VideoCollectionViewUtils::setWidgetActivityLevel(level);
-VideoCollectionCommon::TCollectionLevels level = mCurrentList->getLevel();
+}
-VideoCollectionViewUtils::saveWidgetLevel(level);
 mCurrentList->deactivate();
 }
 }
 // ---------------------------------------------------------------------------
 // Collections tab
 mToolbarActions[ETBActionCollections] = createAction("qtg_mono_video_collection",
 mToolbarViewsActionGroup, SLOT(openCollectionViewSlot()));
-if (!mIsService)
+if (!mVideoServices)
 {
 			// Services tab
 			mToolbarActions[ETBActionServices] = createAction("qtg_mono_ovistore",
 					mToolbarViewsActionGroup, SLOT(openServicesViewSlot()));
 			// Add Videos tab
 HbToolBar *bar = toolBar(); // First call to toolBar() creates the object, so on failure it could return 0.
 if(   !bar
 		   || !mToolbarActions[ETBActionAllVideos]
 || !mToolbarActions[ETBActionCollections]
-|| ( !mIsService && (!mToolbarActions[ETBActionServices]
+|| ( !mVideoServices && (!mToolbarActions[ETBActionServices]
 || !mToolbarActions[ETBActionAddVideos]
 || !mToolbarActions[ETBActionRemoveVideos])))
 {
 ERROR(-1, "VideoListView::createToolbar() failed to create all actions or the toolbar.");
 	delete mToolbarActions[ETBActionAllVideos];
 // Collection view actions are not checkable
 mToolbarActions[ETBActionAllVideos]->setCheckable(true);
 mToolbarActions[ETBActionCollections]->setCheckable(true);
-if (!mIsService)
+if (!mVideoServices)
 {
 	mToolbarActions[ETBActionServices]->setCheckable(false);
 }
+VideoCollectionCommon::TCollectionLevels level = VideoCollectionCommon::ELevelVideos;
-if(mCurrentList->getLevel() == VideoCollectionCommon::ELevelCategory)
+if(mCurrentList)
+{
+level = mCurrentList->getLevel();
+}
+if(level == VideoCollectionCommon::ELevelCategory)
 {
 mToolbarActions[ETBActionCollections]->setChecked(true);
-}
+bar->addActions(mToolbarViewsActionGroup->actions());
-else
+}
+else if(level == VideoCollectionCommon::ELevelVideos )
 {
 mToolbarActions[ETBActionAllVideos]->setChecked(true);
-}
+bar->addActions(mToolbarViewsActionGroup->actions());
+}
-bar->addActions(mToolbarViewsActionGroup->actions());
+else if(level == VideoCollectionCommon::ELevelAlbum)
+{
+bar->addActions(mToolbarCollectionActionGroup->actions());
+}
 }
 return 0;
 }
 hintWidget->deactivate();
 hintWidget->setButtonShown(true);
 }
 }
-if (mToolbarViewsActionGroup && mToolbarCollectionActionGroup && !mIsService)
+if (mToolbarViewsActionGroup && mToolbarCollectionActionGroup && !mVideoServices)
 {
 if (show)
 {
 	mToolbarActions[ETBActionRemoveVideos]->setVisible(false);
 }
 action->setVisible(show);
 }
 }
 // ---------------------------------------------------------------------------
-// activateVideosView()
+// activateMainView()
 // ---------------------------------------------------------------------------
 //
-int VideoListView::activateVideosView()
+int VideoListView::activateMainView()
 {
 FUNC_LOG;
 if(!mCurrentList)
 {
 return -1;
 }
-VideoCollectionCommon::TCollectionLevels level = mCurrentList->getLevel();
+int result = mCurrentList->activate();
-int result = mCurrentList->activate(level);
 if(result < 0)
 {
 ERROR(result, "VideoListView::activateVideosView() failed to activate.");
-// activate failed, deactivate view so we get rid of dangling connections.
-deactivateView();
 return -1;
 }
-if (createToolbar() != 0)
+return 0;
-{
+}
-ERROR(result, "VideoListView::activateVideosView() failed to create toolbar.");
-deactivateView();
+// ---------------------------------------------------------------------------
+// activateCollectionContentView()
+// ---------------------------------------------------------------------------
+//
+int VideoListView::activateCollectionContentView(const TMPXItemId &itemId)
+{
+FUNC_LOG;
+// resolve collection name if possible
+if(itemId.iId2  == KVcxMvcMediaTypeCategory && mCollectionName.isEmpty())
+{
+if (itemId.iId1 == KVcxMvcCategoryIdDownloads)
+{
+mCollectionName = hbTrId("txt_videos_dblist_downloaded");
+}
+else if(itemId.iId1 == KVcxMvcCategoryIdCaptured)
+{
+mCollectionName = hbTrId("txt_videos_dblist_captured");
+}
+else
+{
+// only downloads and captured are supported in default collections
+ERROR(-1, "VideoListView::activateVideosView() invalid defauld collection.");
+return -1;
+}
+}
+// at this point activation will fail if there's no collection name available
+if(mCollectionName.isEmpty())
+{
+ERROR(-1, "VideoListView::activateVideosView() no collection name, cannot proceed.");
 return -1;
 }
+// if current list at this point is already collection content,
+// no need to init again, just activate
+if(mCurrentList &&
+(mCurrentList->getLevel() == VideoCollectionCommon::ELevelDefaultColl ||
+mCurrentList->getLevel() == VideoCollectionCommon::ELevelAlbum))
+{
+return mCurrentList->activate();
+}
+// no currentlist, or currentlist differs, create and initialize all over
+collectionOpenedSlot(true, mCollectionName, itemId);
+if((!mCurrentList || !mCurrentList->getModel()) ||
+(mCurrentList->getLevel() != VideoCollectionCommon::ELevelDefaultColl &&
+mCurrentList->getLevel() != VideoCollectionCommon::ELevelAlbum ))
+{
+ERROR(-1, "VideoListView::activateVideosView() failed to init and activate collection.");
+return -1;
+}
+// if we're servicing, need to fetch sorting role from client
+// in normal use, sorting has set already at uiloader
+if (mVideoServices)
+{
+// TODO: service sorting roles needs to be defined somewhere
+int sortRole = mVideoServices->sortRole();
+if(sortRole == 2)
+{
+sortRole = VideoCollectionCommon::KeyTitle;
+}
+else if(sortRole == 3)
+{
+sortRole = VideoCollectionCommon::KeySizeValue;
+}
+else
+{
+// default
+sortRole = VideoCollectionCommon::KeyDateTime;
+}
+mCurrentList->getModel()->doSorting(sortRole, Qt::AscendingOrder);
+}
 return 0;
-}
-// ---------------------------------------------------------------------------
-// activateCollectionContentView()
-// ---------------------------------------------------------------------------
-//
-int VideoListView::activateCollectionContentView(const TMPXItemId &itemId)
-{
-FUNC_LOG;
-int err = 0;
-if (itemId.iId2 == KVcxMvcMediaTypeCategory ||
-itemId.iId2 == KVcxMvcMediaTypeAlbum)
-{
-// currently only captured and downloaded categories are supported
-switch (itemId.iId1)
-{
-case KVcxMvcCategoryIdDownloads:
-case KVcxMvcCategoryIdCaptured:
-{
-VideoListWidget *collectionContentWidget =
-mUiLoader->findWidget<VideoListWidget>(
-DOCML_NAME_VC_COLLECTIONCONTENTWIDGET);
-if (collectionContentWidget && collectionContentWidget->getModel())
-{
-// no need to deactivate since there cannot be previous widget
-mCurrentList = collectionContentWidget;
-// resolve collection name
-if (itemId.iId1 == KVcxMvcCategoryIdDownloads)
-{
-mCollectionName = hbTrId("txt_videos_dblist_downloaded");
-}
-else if (itemId.iId1 == KVcxMvcCategoryIdCaptured)
-{
-mCollectionName = hbTrId("txt_videos_dblist_captured");
-}
-// activate collection content widget
-mCurrentList->activate(VideoCollectionCommon::ELevelDefaultColl);
-// open the model
-VideoSortFilterProxyModel *model = mCurrentList->getModel();
-model->openItem(itemId);
-// sort model
-int sortRole = VideoCollectionCommon::KeyDateTime;
-if (mIsService &&
-mVideoServices)
-{
-// TODO: sorting roles needs to be defined somewhere
-sortRole = mVideoServices->sortRole();
-switch (sortRole)
-{
-// sort by name
-case 2:
-{
-sortRole = VideoCollectionCommon::KeyTitle;
-break;
-}
-// sort by size
-case 3:
-{
-sortRole = VideoCollectionCommon::KeySizeValue;
-break;
-}
-// date & time
-case 1:
-// fall through
-default:
-{
-sortRole = VideoCollectionCommon::KeyDateTime;
-break;
-}
-}
-}
-model->doSorting(sortRole, Qt::AscendingOrder);
-// set hint level to collections
-setHintLevel(VideoHintWidget::Collection);
-}
-else
-{
-ERROR(-1, "VideoListView::activateVideosView() failed to get collection content widget.");
-err = -1;
-}
-break;
-}
-default:
-{
-// by default open videos view
-err = activateVideosView();
-break;
-}
-}
-}
-else
-{
-// open videos view
-err = activateVideosView();
-}
-return err;
 }
 // ---------------------------------------------------------------------------
 // openAllVideosViewSlot()
 // ---------------------------------------------------------------------------
 	{
 		order = Qt::DescendingOrder;
 	}
 	model->doSorting(role, order);
-	if (mCurrentList == mUiLoader->findWidget<VideoListWidget>(DOCML_NAME_VC_COLLECTIONCONTENTWIDGET))
+	// for video related sorting, all videos list and collection content
+	// list, sorting orders are same all the time
+	VideoListWidget *anotherVideosList = 0;
+	VideoCollectionCommon::TCollectionLevels level = mCurrentList->getLevel();
+	if (level == VideoCollectionCommon::ELevelDefaultColl ||
+	    level == VideoCollectionCommon::ELevelAlbum)
 	{
-	    VideoListWidget *allVideosList = mUiLoader->findWidget<VideoListWidget>(DOCML_NAME_VC_VIDEOLISTWIDGET);
+	    anotherVideosList = mUiLoader->findWidget<VideoListWidget>(DOCML_NAME_VC_VIDEOLISTWIDGET);
-	    if(allVideosList && allVideosList->getModel())
-	    {
-	        allVideosList->getModel()->doSorting(role, order);
-	    }
 	}
+	else if(level == VideoCollectionCommon::ELevelVideos)
+	{
+	    anotherVideosList = mUiLoader->findWidget<VideoListWidget>(DOCML_NAME_VC_COLLECTIONCONTENTWIDGET);
+	}
+if(anotherVideosList && anotherVideosList->getModel())
+{
+anotherVideosList->getModel()->doSorting(role, order);
+}
 // save sorting values only if the application is not started as a service
-	if (!mIsService)
+	if (!mVideoServices)
 	{
 	    // save sorting values
 	    mUiUtils.saveSortingValues(role, order, mCurrentList->getLevel());
 	}
 }
 // aboutToShowMainMenuSlot
 // -------------------------------------------------------------------------------------------------
 //
 void VideoListView::aboutToShowMainMenuSlot()
 {
-if (mIsService &&
+if (mVideoServices &&
-mVideoServices &&
 mVideoServices->currentService() == VideoServices::EBrowse)
 {
 prepareBrowseServiceMenu();
 return;
 }
 		if (action)
 		{
 			action->setChecked(true);
 		}
-if (!mIsService)
+if (!mVideoServices)
 {
 showAction(true, DOCML_NAME_ADD_TO_COLLECTION);
 showAction(true, DOCML_NAME_DELETE_MULTIPLE);
 }
 }
 else if(mToolbarViewsActionGroup->checkedAction() == mToolbarActions[ETBActionCollections] &&
 		firstAction == mToolbarActions[ETBActionAllVideos] )
 {
-if (!mIsService)
+if (!mVideoServices)
 {
 showAction(true, DOCML_NAME_CREATE_COLLECTION);
 }
 showAction(true, DOCML_NAME_SORT_MENU);
 showAction(true, DOCML_NAME_SORT_BY_NAME);
 		if (action)
 		{
 			action->setChecked(true);
 		}
-if (!mIsService)
+if (!mVideoServices)
 {
 showAction(true, DOCML_NAME_DELETE_MULTIPLE);
 }
 }
 }
 // -------------------------------------------------------------------------------------------------
 // collectionOpenedSlot
 // -------------------------------------------------------------------------------------------------
 //
-void VideoListView::collectionOpenedSlot(bool collectionOpened,
+void VideoListView::collectionOpenedSlot(bool openingCollection,
 const QString& collection,
-const QModelIndex &index)
+const TMPXItemId &collectionId)
 {
 	FUNC_LOG;
-	if(!mCurrentList || !mCurrentList->getModel())
-	{
-	    return;
-	}
 // clear toolbar actions.
 toolBar()->clearActions();
 VideoListWidget *collectionContentWidget =
 mUiLoader->findWidget<VideoListWidget>(
 	// disable collection content animations during widget change
 	HbAbstractItemView::ItemAnimations animationState = collectionContentWidget->enabledAnimations();
 	collectionContentWidget->setEnabledAnimations(HbAbstractItemView::None);
-	if(collectionOpened)
+	if(openingCollection)
 {
 // open album view
-if (!index.isValid() || !mCurrentList || mCurrentList == collectionContentWidget)
+if (collectionId == TMPXItemId::InvalidId() || mCurrentList == collectionContentWidget)
 {
 // no currentlist or currentlist is already collection content -list
 collectionContentWidget->setEnabledAnimations(animationState);
 return;
 }
-// get item id before deactivating
-TMPXItemId itemId = mCurrentList->getModel()->getMediaIdAtIndex(index);
 // get level from the item to be opened only default
 // or user defined collections can be activated here
 VideoCollectionCommon::TCollectionLevels level = VideoCollectionCommon::ELevelInvalid;
-if(itemId.iId2 == KVcxMvcMediaTypeCategory)
+if(collectionId.iId2 == KVcxMvcMediaTypeCategory)
 {
 level = VideoCollectionCommon::ELevelDefaultColl;
 }
-else if(itemId.iId2 == KVcxMvcMediaTypeAlbum)
+else if(collectionId.iId2 == KVcxMvcMediaTypeAlbum)
 {
 level = VideoCollectionCommon::ELevelAlbum;
 }
 else
 {
 // Start fetching content before changing.
 VideoSortFilterProxyModel *model = collectionContentWidget->getModel();
 if(!model)
 {
 // no model for content widget, cannot activate
+collectionContentWidget->setEnabledAnimations(animationState);
 return;
 }
-model->openItem(itemId);
+model->openItem(collectionId);
 // deactivat current widget.
-mCurrentList->deactivate();
+if(mCurrentList)
+{
+mCurrentList->deactivate();
+}
 // activate video collection content widget and set it as current list.
 mCurrentList = collectionContentWidget;
 mCurrentList->activate(level);
 mToolbarActions[ETBActionCollections]->setChecked(true);
 }
 }
 	// restore animations for collection content widget
 	collectionContentWidget->setEnabledAnimations(animationState);
+	if(!mVideoServices)
+	{
+	    // save / clear collection related activity data
+	    VideoCollectionViewUtils::setCollectionActivityData(collectionId, collection);
+	}
 }
 // -------------------------------------------------------------------------------------------------
 // objectReadySlot
 // -------------------------------------------------------------------------------------------------
 }
 }
 else if (name.compare(DOCML_NAME_VC_COLLECTIONWIDGET) == 0)
 {
 connect(
-object, SIGNAL(collectionOpened(bool, const QString&, const QModelIndex&)),
+object, SIGNAL(collectionOpened(bool, const QString&, const TMPXItemId&)),
-this, SLOT(collectionOpenedSlot(bool, const QString&, const QModelIndex&)));
+this, SLOT(collectionOpenedSlot(bool, const QString&, const TMPXItemId&)));
 if(mCurrentList != object)
 {
 // this widget not yet activated so it's has been created on the second phase
 // safe to call doDelayed right away
 qobject_cast<VideoListWidget*>(object)->doDelayedsSlot();
 }
 else if (name.compare(DOCML_NAME_VC_COLLECTIONCONTENTWIDGET) == 0)
 {
 connect(object, SIGNAL(command(int)), this, SIGNAL(command(int)));
 connect(
-object, SIGNAL(collectionOpened(bool, const QString&, const QModelIndex&)),
+object, SIGNAL(collectionOpened(bool, const QString&, const TMPXItemId&)),
-this, SLOT(collectionOpenedSlot(bool, const QString&, const QModelIndex&)));
+this, SLOT(collectionOpenedSlot(bool, const QString&, const TMPXItemId&)));
 if(mCurrentList != object)
 {
 // this widget not yet activated so it's has been created on the second phase
 // safe to call doDelayed right away
 qobject_cast<VideoListWidget*>(object)->doDelayedsSlot();

changeset 41	229f037ce963
parent 40	13331705e488
child 44	518105d52e45