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

equal deleted inserted replaced

-:b9e04db066d4
+:7d93ee07fb27
 *
 * Description:   Videolist view class source code
 *
 */
-// Version : %version: 101 %
+// Version : %version: 106 %
 // INCLUDE FILES
 #include <xqserviceutil.h>
 #include <qactiongroup.h>
 #include <hbinstance.h>
 #include "videosortfilterproxymodel.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
 // ---------------------------------------------------------------------------
 //
 VideoListView::VideoListView( VideoCollectionUiLoader *uiLoader, QGraphicsItem *parent )
 , mUiUtils( VideoCollectionViewUtils::instance() )
 , mWrapper( VideoCollectionWrapper::instance() )
 , mUiLoader( uiLoader )
 , mIsService( false )
 , mModelReady( false )
+, mViewReady( false )
 , mHintLevel( VideoHintWidget::AllVideos )
 , mVideoServices( 0 )
 , mCurrentList( 0 )
 , mToolbarViewsActionGroup( 0 )
 , mToolbarCollectionActionGroup( 0 )
 {
 	FUNC_LOG;
 	// if mModelReady is false, then it means that this is the first time modelReady
 	// signal fires. Signaling that view is ready.
-	if(!mModelReady)
+	if(!mViewReady)
 	{
+	    mViewReady = true;
 	    emit viewReady();
 	}
 mModelReady = true;
 // ---------------------------------------------------------------------------
 //
 void VideoListView::layoutChangedSlot()
 {
 	FUNC_LOG;
+	// Note that showHint should be executed before updateSubLabel as it
+	// can modify the mModelReady flag.
+showHint();
 updateSubLabel();
-if(mModelReady)
-{
-showHint();
-}
 }
 // ---------------------------------------------------------------------------
 // deactivateView()
 // ---------------------------------------------------------------------------
 disconnect(&mWrapper, SIGNAL(asyncStatus(int, QVariant&)),
 this, SLOT(handleAsyncStatusSlot(int, QVariant&)));
 HbMenu *menu = mUiLoader->findWidget<HbMenu>(DOCML_NAME_OPTIONS_MENU);
-if (menu)
+if(menu)
 {
+menu->setObjectName(LIST_VIEW_OBJECT_NAME_OPTIONS_MENU);
 menu->hide();
 }
 if(mCurrentList && &(mCurrentList->getModel()) && mCurrentList->getModel().sourceModel())
 {
 // ---------------------------------------------------------------------------
 //
 int VideoListView::createToolbar()
 {
 	FUNC_LOG;
-// Create actiongroup and add all actions to it. This ensures that only one is
+	// Create actiongroup and add all actions to it. This ensures that only one is
 // active at certain moment.
 if(!mToolbarViewsActionGroup && !mToolbarCollectionActionGroup)
 {
 	mToolbarViewsActionGroup = new QActionGroup(this);
 mToolbarCollectionActionGroup = new QActionGroup(this);
 // create toolbar item actions
 // All Videos tab
-mToolbarActions[ETBActionAllVideos] = createAction(":/images/qtg_mono_video_all.svg",
+mToolbarActions[ETBActionAllVideos] = createAction("qtg_mono_video",
 mToolbarViewsActionGroup, SLOT(openAllVideosViewSlot()));
 // Collections tab
 mToolbarActions[ETBActionCollections] = createAction("qtg_mono_video_collection",
 mToolbarViewsActionGroup, SLOT(openCollectionViewSlot()));
 return;
 }
 VideoSortFilterProxyModel &model = mCurrentList->getModel();
-// prepare hint widget
+if(!mModelReady && model.rowCount() == 0)
+{
+return;
+}
+mModelReady = true;
+// decide if the hintwidget needs to be shown or not.
+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>(
-DOCML_NAME_VC_VIDEOHINTWIDGET);
+DOCML_NAME_VC_VIDEOHINTWIDGET, show);
 if (hintWidget)
 {
 hintWidget->setLevel(mHintLevel);
-if (mModelReady &&
+if (show)
-model.rowCount() == 0)
+{
-{
+hintWidget->activate();
-show ? hintWidget->activate() : hintWidget->deactivate();
-}
-else
-{
-show = false;
-hintWidget->deactivate();
-}
-if(show)
-{
 bool showHintBtns = (mCurrentList->getLevel() != VideoCollectionCommon::ELevelDefaultColl);
 hintWidget->setButtonShown(showHintBtns);
 }
 else
 {
+hintWidget->deactivate();
 hintWidget->setButtonShown(true);
 }
 }
 if (mToolbarViewsActionGroup && mToolbarCollectionActionGroup && !mIsService)
 if(mCurrentList)
 {
 model = &mCurrentList->getModel();
 }
-if (model)
+if (model && mModelReady)
 {
 int itemCount = model->rowCount();
 HbGroupBox *subLabel =
 mUiLoader->findWidget<HbGroupBox>(
 // activate all videos list
 mCurrentList = videoListWidget;
 mCurrentList->activate(VideoCollectionCommon::ELevelVideos);
-// since collection is not to be opened at this point,
-// we do not receive lauoutChanged for updating the hind -widget
-// if needed, need to show it here is needed
 setHintLevel(VideoHintWidget::AllVideos);
-showHint();
+// update the sublabel, as in most cases the data is already up to date.
+updateSubLabel();
 }
 }
 // ---------------------------------------------------------------------------
 // openCollectionViewSlot()
 mCurrentList = collectionWidget;
 mCurrentList->activate(VideoCollectionCommon::ELevelCategory);
 VideoSortFilterProxyModel &model = mCurrentList->getModel();
-VideoCollectionViewUtils::sortModel(&model, false, mCurrentList->getLevel());
+// the collection view is not empty, so we should hide the hint in advance.
-// the collection view is not empty, so we can hide the hint in advance.
 showHint(false);
+// also update the sublabel immediatelly, as the data is up to date almost always.
+updateSubLabel();
 }
 }
 // ---------------------------------------------------------------------------
 // openNewAlbumSlot()
 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->getText(label, this, SLOT(createCollectionDialogFinished(HbAction *)), text);
+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;
-Q_UNUSED(action);
 HbInputDialog *dialog = static_cast<HbInputDialog*>(sender());
 QVariant variant = dialog->value();
 collectionContentWidget->setEnabledAnimations(animationState);
 return;
 }
 // Start fetching content before changing.
-collectionContentWidget->getModel().openItem(itemId);
+VideoSortFilterProxyModel &model = collectionContentWidget->getModel();
+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();
-// setup correct sorting, collection content contains always a list of videos so we use
+model.invalidate();
-// ELevelVideos as target for sorting
-VideoCollectionViewUtils::sortModel(&mCurrentList->getModel(), false, VideoCollectionCommon::ELevelVideos);
-mCurrentList->getModel().invalidate();
 // update hint widget for correct content
+mModelReady = model.rowCount() > 0;
 setHintLevel(VideoHintWidget::Collection);
-showHint();
 // update toolbar for albums, default categories don't have one.
 if(level == VideoCollectionCommon::ELevelAlbum &&
 mToolbarCollectionActionGroup && mToolbarActions.contains(ETBActionCollections))
 {
 mToolbarActions[ETBActionCollections]->setChecked(true);
 }
 }
 	// restore animations for collection content widget
 	collectionContentWidget->setEnabledAnimations(animationState);
 }
 // -------------------------------------------------------------------------------------------------
 // objectReadySlot
 // -------------------------------------------------------------------------------------------------
 {
 	FUNC_LOG;
 HbMessageBox::information(tr("Not implemented yet"));
 }
-// end of file
+// End of file

changeset 24	7d93ee07fb27
parent 20	b9e04db066d4
child 28	c48470be1ba7