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

equal deleted inserted replaced

-:bbb98528c666
+:3738fe97f027
 // VideoCollectionUiLoader
 // ---------------------------------------------------------------------------
 //
 VideoCollectionUiLoader::~VideoCollectionUiLoader()
 {
-// selection dialog needs to be deleted manually
+if (mTimerId)
+{
+killTimer(mTimerId);
+mTimerId = 0;
+}
+	// selection dialog needs to be deleted manually
+QGraphicsWidget *widget =
+HbDocumentLoader::findWidget(DOCML_NAME_DIALOG);
 VideoListSelectionDialog *dialog =
-findWidget<VideoListSelectionDialog>(
+qobject_cast<VideoListSelectionDialog*>(widget);
-DOCML_NAME_DIALOG);
 delete dialog;
 // clear queue and hash tables
 mQueue.clear();
+mDocmls.clear();
 mWidgets.clear();
 mObjects.clear();
+}
+// ---------------------------------------------------------------------------
+// load
+// ---------------------------------------------------------------------------
+//
+QObjectList VideoCollectionUiLoader::load( const QString &fileName, bool *ok )
+{
+	QObjectList list;
+	if (!mDocmls.contains(fileName))
+	{
+		mDocmls.append(fileName);
+		list = HbDocumentLoader::load(fileName, ok);
+		//TODO: save returned and delete on destructor
+	}
+	return list;
+}
+// ---------------------------------------------------------------------------
+// load
+// ---------------------------------------------------------------------------
+//
+QObjectList VideoCollectionUiLoader::load( const QString &fileName, const QString &section , bool *ok )
+{
+	return HbDocumentLoader::load(fileName, section, ok);
+	//TODO: save returned and delete on destructor
 }
 // ---------------------------------------------------------------------------
 // startLoading
 // ---------------------------------------------------------------------------
 VideoCollectionUiLoader::Params params(
 DOCML_NAME_VC_HEADINGBANNER,
 true, // is widget
 receiver,
 DOCML_VIDEOCOLLECTIONVIEW_FILE,
+0,
 widgetSlot);
 addToQueue(params);
 }
 if (uiSections.contains(DOCML_NAME_VC_VIDEOLISTWIDGET))
 {
 VideoCollectionUiLoader::Params params(
 DOCML_NAME_VC_VIDEOLISTWIDGET,
 true, // is widget
 receiver,
 DOCML_VIDEOCOLLECTIONVIEW_FILE,
+0,
 widgetSlot);
 addToQueue(params);
 }
 if (uiSections.contains(DOCML_NAME_OPTIONS_MENU))
 {
 VideoCollectionUiLoader::Params params(
 DOCML_NAME_OPTIONS_MENU,
 true, // is widget
 receiver,
 DOCML_VIDEOCOLLECTIONVIEW_FILE,
+0,
 widgetSlot);
 addToQueue(params);
 }
 if (uiSections.contains(DOCML_NAME_ADD_TO_COLLECTION))
 {
 VideoCollectionUiLoader::Params params(
 DOCML_NAME_ADD_TO_COLLECTION,
 false, // is object
 receiver,
 DOCML_VIDEOCOLLECTIONVIEW_FILE,
+0,
 objectSlot);
 addToQueue(params);
 }
 if (uiSections.contains(DOCML_NAME_CREATE_COLLECTION))
 {
 VideoCollectionUiLoader::Params params(
 DOCML_NAME_CREATE_COLLECTION,
 false, // is object
 receiver,
 DOCML_VIDEOCOLLECTIONVIEW_FILE,
+0,
 objectSlot);
 addToQueue(params);
 }
 if (uiSections.contains(DOCML_NAME_DELETE_MULTIPLE))
 {
 VideoCollectionUiLoader::Params params(
 DOCML_NAME_DELETE_MULTIPLE,
 false, // is object
 receiver,
 DOCML_VIDEOCOLLECTIONVIEW_FILE,
+0,
 objectSlot);
 addToQueue(params);
 }
 if (uiSections.contains(DOCML_NAME_VC_VIDEOHINTWIDGET))
 {
 VideoCollectionUiLoader::Params params(
 DOCML_NAME_VC_VIDEOHINTWIDGET,
 true, // is widget
 receiver,
 DOCML_VIDEOCOLLECTIONVIEW_FILE,
+DOCML_VIDEOCOLLECTIONVIEW_SECTION_HINT,
 widgetSlot);
 addToQueue(params);
 }
 if (uiSections.contains(DOCML_NAME_HINT_BUTTON))
 {
 VideoCollectionUiLoader::Params params(
 DOCML_NAME_HINT_BUTTON,
 true, // is widget
 receiver,
 DOCML_VIDEOCOLLECTIONVIEW_FILE,
+DOCML_VIDEOCOLLECTIONVIEW_SECTION_HINT,
 widgetSlot);
 addToQueue(params);
 }
 if (uiSections.contains(DOCML_NAME_NO_VIDEOS_LABEL))
 {
 VideoCollectionUiLoader::Params params(
 DOCML_NAME_NO_VIDEOS_LABEL,
 true, // is widget
 receiver,
 DOCML_VIDEOCOLLECTIONVIEW_FILE,
+DOCML_VIDEOCOLLECTIONVIEW_SECTION_HINT,
 widgetSlot);
 addToQueue(params);
 }
 if (uiSections.contains(DOCML_NAME_SORT_BY_DATE))
 {
 VideoCollectionUiLoader::Params params(
 DOCML_NAME_SORT_BY_DATE,
 false, // is object
 receiver,
 DOCML_VIDEOCOLLECTIONVIEW_FILE,
+0,
 objectSlot);
 addToQueue(params);
 }
 if (uiSections.contains(DOCML_NAME_SORT_BY_NAME))
 {
 VideoCollectionUiLoader::Params params(
 DOCML_NAME_SORT_BY_NAME,
 false, // is object
 receiver,
 DOCML_VIDEOCOLLECTIONVIEW_FILE,
+			0,
 objectSlot);
 addToQueue(params);
 }
 if (uiSections.contains(DOCML_NAME_SORT_BY_NUMBER_OF_ITEMS))
 {
 VideoCollectionUiLoader::Params params(
 DOCML_NAME_SORT_BY_NUMBER_OF_ITEMS,
 false, // is object
 receiver,
 DOCML_VIDEOCOLLECTIONVIEW_FILE,
-objectSlot);
+			0,
-addToQueue(params);
-}
-if (uiSections.contains(DOCML_NAME_SORT_BY_TOTAL_LENGTH))
-{
-VideoCollectionUiLoader::Params params(
-DOCML_NAME_SORT_BY_TOTAL_LENGTH,
-false, // is object
-receiver,
-DOCML_VIDEOCOLLECTIONVIEW_FILE,
 objectSlot);
 addToQueue(params);
 }
 if (uiSections.contains(DOCML_NAME_SORT_BY_SIZE))
 {
 VideoCollectionUiLoader::Params params(
 DOCML_NAME_SORT_BY_SIZE,
 false, // is object
 receiver,
 DOCML_VIDEOCOLLECTIONVIEW_FILE,
+0,
 objectSlot);
 addToQueue(params);
 }
 if (uiSections.contains(DOCML_NAME_SORT_MENU))
 {
 VideoCollectionUiLoader::Params params(
 DOCML_NAME_SORT_MENU,
 true, // is widget
 receiver,
 DOCML_VIDEOCOLLECTIONVIEW_FILE,
+0,
 widgetSlot);
 addToQueue(params);
 }
 if (uiSections.contains(DOCML_NAME_VC_COLLECTIONWIDGET))
 {
 VideoCollectionUiLoader::Params params(
 DOCML_NAME_VC_COLLECTIONWIDGET,
 true, // is widget
 receiver,
 DOCML_VIDEOCOLLECTIONVIEW_FILE,
+DOCML_VIDEOCOLLECTIONVIEW_SECTION_LIST,
 widgetSlot);
 addToQueue(params);
 }
 if (uiSections.contains(DOCML_NAME_VC_COLLECTIONCONTENTWIDGET))
 {
 VideoCollectionUiLoader::Params params(
 DOCML_NAME_VC_COLLECTIONCONTENTWIDGET,
 true, // is widget
 receiver,
 DOCML_VIDEOCOLLECTIONVIEW_FILE,
+DOCML_VIDEOCOLLECTIONVIEW_SECTION_LIST,
 widgetSlot);
 addToQueue(params);
 }
 if (uiSections.contains(DOCML_NAME_DIALOG))
 {
 VideoCollectionUiLoader::Params params(DOCML_NAME_DIALOG,
 true, // is widget
 receiver,
 DOCML_VIDEOSELECTIONDIALOG_FILE,
+0,
 widgetSlot);
 addToQueue(params);
 }
 }
 // 2. load from document
 else
 {
 widget = HbDocumentLoader::findWidget(name);
+if (!widget)
+{
+// check if the widget is being loaded and remove it from queue
+int count = mQueue.count();
+for (int i = 0; i < count; i++)
+{
+const Params& params = mQueue.at(i);
+if (params.mName.compare(name) == 0)
+{
+					bool ok(true);
+					if(!mDocmls.contains(params.mDocml))
+					{
+						load(params.mDocml, &ok);
+						if (ok)
+						{
+							mDocmls.append(params.mDocml);
+						}
+					}
+					if ((params.mSection != 0) && ok)
+					{
+						load(params.mDocml, params.mSection, &ok);
+					}
+					if(ok)
+					{
+						widget = HbDocumentLoader::findWidget(params.mName);
+					}
+break;
+}
+}
+}
 if (widget)
 {
 // initialize widget
 initWidget(widget, name);
 disconnect(
 this, SIGNAL(widgetReady(QGraphicsWidget*, const QString&)),
 params.mReceiver, params.mMember);
 }
 mQueue.removeAt(i);
+runNext(); //removes timer if queue is empty
 break;
 }
 }
 }
 }
 // 2. load from document and cancel async loading
 else
 {
 object = HbDocumentLoader::findObject(name);
+if (!object)
+{
+// check if the object is being loaded and remove it from queue
+int count = mQueue.count();
+for (int i = 0; i < count; i++)
+{
+const Params& params = mQueue.at(i);
+if (params.mName.compare(name) == 0)
+{
+					bool ok(true);
+					if(!mDocmls.contains(params.mDocml))
+					{
+						load(params.mDocml, &ok);
+						if (ok)
+						{
+							mDocmls.append(params.mDocml);
+						}
+					}
+					if ((params.mSection != 0) && ok)
+					{
+						load(params.mDocml, params.mSection, &ok);
+					}
+					if(ok)
+					{
+						object = HbDocumentLoader::findObject(params.mName);
+					}
+break;
+}
+}
+}
 if (object)
 {
 // initialize widget
 initObject(object, name);
 disconnect(
 this, SIGNAL(objectReady(QObject*, const QString&)),
 params.mReceiver, params.mMember);
 }
 mQueue.removeAt(i);
+runNext(); //removes timer if queue is empty
 break;
 }
 }
 }
 }
 if (mIsService)
 {
 videoServices = VideoServices::instance();
 }
 videoList->initialize(*model, videoServices);
+HbEffect::add(videoList,
+EFFECT_SLIDE_IN_TO_LEFT_FILENAME,
+EFFECT_SLIDE_IN_TO_LEFT);
+HbEffect::add(videoList,
+EFFECT_SLIDE_OUT_TO_LEFT_FILENAME,
+EFFECT_SLIDE_OUT_TO_LEFT);
 }
 }
 }
 else if (name.compare(DOCML_NAME_DIALOG) == 0)
 {
 // ensure that all the actions related to sort menu are loaded
 // when sort menu is loaded
 findObject<HbAction>(DOCML_NAME_SORT_BY_DATE);
 findObject<HbAction>(DOCML_NAME_SORT_BY_NAME);
 findObject<HbAction>(DOCML_NAME_SORT_BY_NUMBER_OF_ITEMS);
-findObject<HbAction>(DOCML_NAME_SORT_BY_TOTAL_LENGTH);
 findObject<HbAction>(DOCML_NAME_SORT_BY_SIZE);
 // add sub menu actions
 if (!mSortGroup)
 {
 mSortGroup = new QActionGroup(menu);
 mSortGroup->addAction(mMenuActions[EActionSortByDate]);
 mSortGroup->addAction(mMenuActions[EActionSortByName]);
 mSortGroup->addAction(mMenuActions[EACtionSortByItemCount]);
-mSortGroup->addAction(mMenuActions[EActionSortByLength]);
 mSortGroup->addAction(mMenuActions[EActionSortBySize]);
 // set all sub menu items checkable
 foreach (QAction *action, menu->actions())
 {
 }
 else if (name.compare(DOCML_NAME_OPTIONS_MENU) == 0)
 {
 // ensure that all the actions related to options menu are loaded
 // when options menu is loaded
-findObject<HbAction>(DOCML_NAME_ADD_TO_COLLECTION);
+	// when applicaton has been launched as a service,
-findObject<HbAction>(DOCML_NAME_CREATE_COLLECTION);
+	// do not load components which are not required
-findObject<HbAction>(DOCML_NAME_DELETE_MULTIPLE);
+	if(!mIsService)
+	{
+				findObject<HbAction>(DOCML_NAME_ADD_TO_COLLECTION);
+				findObject<HbAction>(DOCML_NAME_CREATE_COLLECTION);
+				findObject<HbAction>(DOCML_NAME_DELETE_MULTIPLE);
+	}
 }
 }
 }
 // ---------------------------------------------------------------------------
 {
 HbAction *action = qobject_cast<HbAction*>(object);
 if (action)
 {
 mMenuActions[EACtionSortByItemCount] = action;
-}
-}
-else if (name.compare(DOCML_NAME_SORT_BY_TOTAL_LENGTH) == 0)
-{
-HbAction *action = qobject_cast<HbAction*>(object);
-if (action)
-{
-mMenuActions[EActionSortByLength] = action;
 }
 }
 else if (name.compare(DOCML_NAME_SORT_BY_SIZE) == 0)
 {
 HbAction *action = qobject_cast<HbAction*>(object);
 QGraphicsWidget *widget =
 HbDocumentLoader::findWidget(params.mName);
 if (!widget)
 {
 // widget not found, try to load the docml
-load(params.mDocml, &ok);
+	if(!mDocmls.contains(params.mDocml))
-if (ok)
+						{
-{
+							load(params.mDocml, &ok);
-widget = HbDocumentLoader::findWidget(params.mName);
-}
+							if (ok)
+							{
+								mDocmls.append(params.mDocml);
+							}
+						}
+						if ((params.mSection != 0) && ok)
+						{
+							load(params.mDocml, params.mSection, &ok);
+						}
+						if(ok)
+						{
+							widget = HbDocumentLoader::findWidget(params.mName);
+						}
 }
 if (widget)
 {
 // widget found, add it to the hash
 if (!mWidgets.contains(params.mName))
 QObject *object =
 HbDocumentLoader::findObject(params.mName);
 if (!object)
 {
 // widget not found, try to load the docml
-load(params.mDocml, &ok);
+						if(!mDocmls.contains(params.mDocml))
-if (ok)
+						{
-{
+							load(params.mDocml, &ok);
-object = HbDocumentLoader::findObject(params.mName);
-}
+							if (ok)
+							{
+								mDocmls.append(params.mDocml);
+							}
+						}
+						if ((params.mSection != 0) && ok)
+						{
+							load(params.mDocml, params.mSection, &ok);
+						}
+						if(ok)
+						{
+							object = HbDocumentLoader::findObject(params.mName);
+						}
 }
 if (object)
 {
 // object found, add it to the hash
 if (!mObjects.contains(params.mName))

changeset 35	3738fe97f027
parent 34	bbb98528c666
child 36	8aed59de29f9