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

equal deleted inserted replaced

-:c48470be1ba7
+:adbe7d5ba2f5
 *
 * Description:   Videolist view class source code
 *
 */
-// Version : %version: 108 %
+// Version : %version: 110 %
 // INCLUDE FILES
 #include <xqserviceutil.h>
 #include <qactiongroup.h>
 #include <hbinstance.h>
 #include "videocollectionuiloader.h"
 #include "mpxhbvideocommondefs.h"
 #include "videocollectiontrace.h"
 // Object names.
-const char* const LIST_VIEW_OBJECT_NAME_CREATE_COLLECTION = "vc::ListViewInputDialogCreateCollection";
 const char* const LIST_VIEW_OBJECT_NAME_OPTIONS_MENU      = "vc::ListViewOptionsMenu";
 // ---------------------------------------------------------------------------
 // Constructor
 // ---------------------------------------------------------------------------
 this, SLOT(orientationChangedSlot(Qt::Orientation))) ||
 !connect(
 &mWrapper, SIGNAL(asyncStatus(int, QVariant&)),
 this, SLOT(handleAsyncStatusSlot(int, QVariant&))) ||
 !connect(
-mCurrentList->getModel().sourceModel(), SIGNAL(modelChanged()),
+mCurrentList->getModel()->sourceModel(), SIGNAL(modelChanged()),
 this, SLOT(layoutChangedSlot())) ||
 !connect(
-mCurrentList->getModel().sourceModel(), SIGNAL(modelReady()),
+mCurrentList->getModel()->sourceModel(), SIGNAL(modelReady()),
 this, SLOT(modelReadySlot())))
 {
 ERROR(-1, "VideoListView::activateView() failed to connect signals.");
 // deactivate view so we get rid of dangling connections.
 deactivateView();
 if(menu)
 {
 menu->setObjectName(LIST_VIEW_OBJECT_NAME_OPTIONS_MENU);
 menu->hide();
 }
-if(mCurrentList && &(mCurrentList->getModel()) && mCurrentList->getModel().sourceModel())
+if(mCurrentList && mCurrentList->getModel() && mCurrentList->getModel()->sourceModel())
 {
-disconnect(mCurrentList->getModel().sourceModel(),
+disconnect(mCurrentList->getModel()->sourceModel(),
 SIGNAL(modelChanged()),
 this, SLOT(layoutChangedSlot()));
-disconnect(mCurrentList->getModel().sourceModel(),
+disconnect(mCurrentList->getModel()->sourceModel(),
 SIGNAL(modelReady()),
 this, SLOT(modelReadySlot()));
 showHint(false);
 }
 if(!mCurrentList)
 {
 return;
 }
-VideoSortFilterProxyModel &model = mCurrentList->getModel();
+VideoSortFilterProxyModel *model = mCurrentList->getModel();
-if(!mModelReady && model.rowCount() == 0)
+if(!model || (!mModelReady && model->rowCount() == 0))
 {
 return;
 }
 mModelReady = true;
 // decide if the hintwidget needs to be shown or not.
-show = show && model.rowCount() == 0;
+show = show && model->rowCount() == 0;
 // If show is false, then hint widget is fetched only if it exists. If
 // show is true then hint widget is also created and prepared if it does not exists.
 VideoHintWidget *hintWidget =
 mUiLoader->findWidget<VideoHintWidget>(
 {
 	FUNC_LOG;
 VideoSortFilterProxyModel *model = 0;
 if(mCurrentList)
 {
-model = &mCurrentList->getModel();
+model = mCurrentList->getModel();
 }
 if (model && mModelReady)
 {
 int itemCount = model->rowCount();
 case KVcxMvcCategoryIdCaptured:
 {
 VideoListWidget *collectionContentWidget =
 mUiLoader->findWidget<VideoListWidget>(
 DOCML_NAME_VC_COLLECTIONCONTENTWIDGET);
-if (collectionContentWidget)
+if (collectionContentWidget && collectionContentWidget->getModel())
 {
 // no need to deactivate since there cannot be previous widget
 mCurrentList = collectionContentWidget;
 // resolve collection name
 // activate collection content widget
 mCurrentList->activate(VideoCollectionCommon::ELevelDefaultColl);
 // open the model
-VideoSortFilterProxyModel &model = mCurrentList->getModel();
+VideoSortFilterProxyModel *model = mCurrentList->getModel();
-model.openItem(itemId);
+model->openItem(itemId);
 // sort model
 int sortRole = VideoCollectionCommon::KeyDateTime;
 if (mIsService &&
 mVideoServices)
 sortRole = VideoCollectionCommon::KeyDateTime;
 break;
 }
 }
 }
-model.doSorting(sortRole, Qt::AscendingOrder);
+model->doSorting(sortRole, Qt::AscendingOrder);
 // set hint level to collections
 setHintLevel(VideoHintWidget::Collection);
 }
 else
 updateSubLabel();
 }
 }
 // ---------------------------------------------------------------------------
-// openNewAlbumSlot()
-// ---------------------------------------------------------------------------
-//
-void VideoListView::openNewAlbumSlot(const QModelIndex &parent,
-int start,
-int end)
-{
-	FUNC_LOG;
-Q_UNUSED(end);
-if(!mCurrentList)
-{
-return;
-}
-// invalidate model
-VideoSortFilterProxyModel &model = mCurrentList->getModel();
-model.invalidate();
-// activate new index
-QModelIndex index = model.index(start, 0, parent);
-if (index.isValid())
-{
-// disconnect rowsInserted signal to prevent obsolete slot calls
-disconnect( &model, SIGNAL(rowsInserted(const QModelIndex&, int, int)),
-this, SLOT(openNewAlbumSlot(const QModelIndex&, int, int)));
-mCurrentList->emitActivated(index);
-}
-}
-// ---------------------------------------------------------------------------
 // openservicesViewSlot()
 // ---------------------------------------------------------------------------
 //
 void VideoListView::openServicesViewSlot()
 {
 // ---------------------------------------------------------------------------
 //
 void VideoListView::doSorting(int role)
 {
 	FUNC_LOG;
+	if(!mCurrentList || !mCurrentList->getModel())
+	{
+	    // no list or model, cannot sort
+	    return;
+	}
 	// sort model
 	Qt::SortOrder order(Qt::AscendingOrder);
-	VideoSortFilterProxyModel &model = mCurrentList->getModel();
+	VideoSortFilterProxyModel *model = mCurrentList->getModel();
-	if(model.sortRole() == role && model.sortOrder() == Qt::AscendingOrder)
+	if(model->sortRole() == role && model->sortOrder() == Qt::AscendingOrder)
 	{
 		order = Qt::DescendingOrder;
 	}
-	model.doSorting(role, order);
+	model->doSorting(role, order);
 	if (mCurrentList == mUiLoader->findWidget<VideoListWidget>(DOCML_NAME_VC_COLLECTIONCONTENTWIDGET))
 	{
-		mUiLoader->findWidget<VideoListWidget>(DOCML_NAME_VC_VIDEOLISTWIDGET)->getModel().doSorting(role, order);
+	    VideoListWidget *allVideosList = mUiLoader->findWidget<VideoListWidget>(DOCML_NAME_VC_VIDEOLISTWIDGET);
+	    if(allVideosList && allVideosList->getModel())
+	    {
+	        allVideosList->getModel()->doSorting(role, order);
+	    }
 	}
 // save sorting values only if the application is not started as a service
 	if (!mIsService)
 	{
 // -------------------------------------------------------------------------------------------------
 //
 void VideoListView::deleteItemsSlot()
 {
 	FUNC_LOG;
-if(!mCurrentList)
-{
-return;
-}
 VideoListSelectionDialog *dialog =
 mUiLoader->findWidget<VideoListSelectionDialog>(
 DOCML_NAME_DIALOG);
 if (dialog)
 {
-TMPXItemId collectionId = mCurrentList->getModel().getOpenItem();
+TMPXItemId collectionId = mCurrentList->getModel()->getOpenItem();
 dialog->setupContent(VideoListSelectionDialog::EDeleteVideos, collectionId);
 dialog->exec();
 }
 }
 // -------------------------------------------------------------------------------------------------
 //
 void VideoListView::createCollectionSlot()
 {
 	FUNC_LOG;
-if(!mCurrentList)
-{
-return;
-}
-// query a name for the collection
-QString label(hbTrId("txt_videos_title_enter_name"));
-QString text(hbTrId("txt_videos_dialog_entry_new_collection"));
-HbInputDialog *dialog = new HbInputDialog();
-dialog->setAttribute(Qt::WA_DeleteOnClose);
-dialog->setObjectName(LIST_VIEW_OBJECT_NAME_CREATE_COLLECTION);
-dialog->setPromptText(label);
-dialog->setValue(text);
-dialog->open(this, SLOT(createCollectionDialogFinished(HbAction *)));
-}
-// -------------------------------------------------------------------------------------------------
-// createCollectionDialogFinished
-// -------------------------------------------------------------------------------------------------
-//
-void VideoListView::createCollectionDialogFinished(HbAction *action)
-{
-FUNC_LOG;
-HbInputDialog *dialog = static_cast<HbInputDialog*>(sender());
-QVariant variant = dialog->value();
-if(dialog->actions().first() == action && variant.isValid())
-{
-VideoSortFilterProxyModel &model = mCurrentList->getModel();
-// resolve collection true name and add new album
-QString text = model.resolveAlbumName(variant.toString());
-if(text.length())
-{
-// when collection reports about new collection, we open it right away,
-// for that, connect to rowsInserted so that the new album can be opened
-if(!connect(&model, SIGNAL(rowsInserted(const QModelIndex&, int, int)),
-this, SLOT(openNewAlbumSlot(const QModelIndex&, int, int))))
-{
-return;
-}
-model.addNewAlbum(text);
-}
-}
-}
-// -------------------------------------------------------------------------------------------------
-// addVideosToCollectionSlot
-// -------------------------------------------------------------------------------------------------
-//
-void VideoListView::addVideosToCollectionSlot()
-{
-	FUNC_LOG;
-if(!mCurrentList)
-{
-return;
-}
 VideoListSelectionDialog *dialog =
 mUiLoader->findWidget<VideoListSelectionDialog>(
 DOCML_NAME_DIALOG);
 if (!dialog)
 {
 // fatal: no selection dialog
 return;
 }
+dialog->setupContent(VideoListSelectionDialog::ECreateCollection, TMPXItemId::InvalidId());
+dialog->exec();
+}
+// -------------------------------------------------------------------------------------------------
+// addVideosToCollectionSlot
+// -------------------------------------------------------------------------------------------------
+//
+void VideoListView::addVideosToCollectionSlot()
+{
+	FUNC_LOG;
+if(!mCurrentList || !mCurrentList->getModel())
+{
+return;
+}
+VideoListSelectionDialog *dialog =
+mUiLoader->findWidget<VideoListSelectionDialog>(
+DOCML_NAME_DIALOG);
+if (!dialog)
+{
+// fatal: no selection dialog
+return;
+}
 if(mCurrentList->getLevel() == VideoCollectionCommon::ELevelAlbum)
 {
 // album is opened, do not proceed in case it already have same amount
 // of videos than all videos view.
 VideoListWidget *allVideos = mUiLoader->findWidget<VideoListWidget>(
 DOCML_NAME_VC_VIDEOLISTWIDGET);
-if(allVideos)
+if(allVideos && allVideos->getModel())
 {
-int count = allVideos->getModel().rowCount();
+int count = allVideos->getModel()->rowCount();
-if(count == mCurrentList->getModel().rowCount())
+if(count == mCurrentList->getModel()->rowCount())
 {
 if(count)
 {
 QVariant emptyAdditional;
 mUiUtils.showStatusMsgSlot(
 }
 return;
 }
 }
 }
-TMPXItemId collectionId = mCurrentList->getModel().getOpenItem();
+TMPXItemId collectionId = mCurrentList->getModel()->getOpenItem();
 dialog->setupContent(VideoListSelectionDialog::EAddToCollection, collectionId);
 dialog->exec();
 }
 // -------------------------------------------------------------------------------------------------
 // -------------------------------------------------------------------------------------------------
 //
 void VideoListView::removeVideosFromCollectionSlot()
 {
 	FUNC_LOG;
-if(!mCurrentList)
+if(!mCurrentList || !mCurrentList->getModel())
 {
 return;
 }
 // not allowed if for some reason current widget
 // is all videos or collection or there are no items
 if(mCurrentList->getLevel() < VideoCollectionCommon::ELevelDefaultColl ||
-!mCurrentList->getModel().rowCount())
+!mCurrentList->getModel()->rowCount())
 {
 return;
 }
 VideoListSelectionDialog *dialog =
 if (!dialog)
 {
 ERROR(-1, "VideoListView::removeVideosFromCollectionSlot() failed to load selection dialog.");
 return;
 }
-TMPXItemId collectionId = mCurrentList->getModel().getOpenItem();
+TMPXItemId collectionId = mCurrentList->getModel()->getOpenItem();
 if(collectionId != TMPXItemId::InvalidId() && collectionId.iId2 != KVcxMvcMediaTypeVideo)
 {
 dialog->setupContent(VideoListSelectionDialog::ERemoveFromCollection, collectionId);
 dialog->exec();
 }
 showAction(false, DOCML_NAME_SORT_BY_NAME);
 showAction(false, DOCML_NAME_SORT_BY_NUMBER_OF_ITEMS);
 showAction(false, DOCML_NAME_SORT_BY_SIZE);
 showAction(false, DOCML_NAME_SORT_MENU);
-VideoSortFilterProxyModel &model = mCurrentList->getModel();
+VideoSortFilterProxyModel *model = mCurrentList->getModel();
-if (!model.rowCount())
+if (!model || !model->rowCount())
 {
 return;
 }
 // get current sorting values
 int role;
 Qt::SortOrder order;
-model.getSorting(role, order);
+model->getSorting(role, order);
 HbAction *firstAction = (HbAction*)(toolBar()->actions().first());
 if(mToolbarViewsActionGroup->checkedAction() == mToolbarActions[ETBActionAllVideos] &&
 firstAction == mToolbarActions[ETBActionAllVideos])
 showAction(false, DOCML_NAME_SORT_BY_NAME);
 showAction(false, DOCML_NAME_SORT_BY_NUMBER_OF_ITEMS);
 showAction(false, DOCML_NAME_SORT_BY_SIZE);
 showAction(false, DOCML_NAME_SORT_MENU);
-VideoSortFilterProxyModel &model = mCurrentList->getModel();
+VideoSortFilterProxyModel *model = mCurrentList->getModel();
-if (!model.rowCount())
+if (!model || !model->rowCount())
 {
 return;
 }
 // show delete action
 showAction(true, DOCML_NAME_SORT_BY_SIZE);
 // set current sort action selected
 int role;
 Qt::SortOrder order;
-model.getSorting(role, order);
+model->getSorting(role, order);
 HbAction* action = mSortingRoles.key(role);
 if (action)
 {
 action->setChecked(true);
 }
 const QString& collection,
 const QModelIndex &index)
 {
 	FUNC_LOG;
+	if(!mCurrentList || !mCurrentList->getModel())
+	{
+	    return;
+	}
 // clear toolbar actions.
 toolBar()->clearActions();
 VideoListWidget *collectionContentWidget =
 mUiLoader->findWidget<VideoListWidget>(
 collectionContentWidget->setEnabledAnimations(animationState);
 return;
 }
 // get item id before deactivating
-TMPXItemId itemId = mCurrentList->getModel().getMediaIdAtIndex(index);
+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)
 collectionContentWidget->setEnabledAnimations(animationState);
 return;
 }
 // Start fetching content before changing.
-VideoSortFilterProxyModel &model = collectionContentWidget->getModel();
+VideoSortFilterProxyModel *model = collectionContentWidget->getModel();
-model.openItem(itemId);
+if(!model)
+{
+// no model for content widget, cannot activate
+return;
+}
+model->openItem(itemId);
 // deactivat current widget.
 mCurrentList->deactivate();
 // activate video collection content widget and set it as current list.
 mCurrentList = collectionContentWidget;
 mCurrentList->activate(level);
 updateSubLabel();
-model.invalidate();
+model->invalidate();
 // update hint widget for correct content
-mModelReady = model.rowCount() > 0;
+mModelReady = model->rowCount() > 0;
 setHintLevel(VideoHintWidget::Collection);
 // update toolbar for albums, default categories don't have one.
 if(level == VideoCollectionCommon::ELevelAlbum &&
 mToolbarCollectionActionGroup && mToolbarActions.contains(ETBActionCollections))

changeset 46	adbe7d5ba2f5
parent 28	c48470be1ba7
child 47	45e72b57a2fd