Fixed Jira issues 50249, 50683, 50387

[apps/osp/MusicPlayer.git] / src / MpFolderContentListForm.cpp

diff --git a/src/MpFolderContentListForm.cpp b/src/MpFolderContentListForm.cpp
index 81b001f..400ddf0 100644 (file)
--- a/src/MpFolderContentListForm.cpp
+++ b/src/MpFolderContentListForm.cpp
@@ -122,30 +122,37 @@ FolderContentListForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previ
        AppLogDebug("ENTER");
        if (pArgs != null)
        {
-               __prevSceneId.Append(*static_cast<String*>(pArgs->GetAt(DATA_ITEM_SCENE_NAME)));
-               __currentFolderIndex = static_cast<Integer*>(pArgs->GetAt(DATA_ITEM_CONTENT_TYPE))->ToInt();
-               __pCurrentFolderPath = new (std::nothrow) String(*(static_cast<String*>(pArgs->GetAt(DATA_ITEM_CONTENT_NAME))));
+               if (previousSceneId.Equals(IDSCN_PLAYLIST_CREATOR, false))
+               {
+                       SetItemCheckedAll(false);
+               }
+               else
+               {
+                       __prevSceneId.Append(*static_cast<String*>(pArgs->GetAt(DATA_ITEM_SCENE_NAME)));
+                       __currentFolderIndex = static_cast<Integer*>(pArgs->GetAt(DATA_ITEM_CONTENT_TYPE))->ToInt();
+                       __pCurrentFolderPath = new (std::nothrow) String(*(static_cast<String*>(pArgs->GetAt(DATA_ITEM_CONTENT_NAME))));
 
-               __pPresentationModel = FolderListPresentationModel::GetInstance();
-               __pPresentationModel->UpdateFolderPathList();
-               __pPresentationModel->InitializeContentList(__currentFolderIndex);
+                       __pPresentationModel = FolderListPresentationModel::GetInstance();
+                       __pPresentationModel->UpdateFolderPathList();
+                       __pPresentationModel->InitializeContentList(__currentFolderIndex);
 
-               int position = INIT_VALUE;
-               __pCurrentFolderPath->LastIndexOf(IDS_SEPARATOR_SLASH, __pCurrentFolderPath->GetLength() - 1, position);
-               __pCurrentFolderPath->SubString(position + 1, __headerTitle);
+                       int position = INIT_VALUE;
+                       __pCurrentFolderPath->LastIndexOf(IDS_SEPARATOR_SLASH, __pCurrentFolderPath->GetLength() - 1, position);
+                       __pCurrentFolderPath->SubString(position + 1, __headerTitle);
 
-               String ellipisiPath = CommonUtil::SetHighDepthToEllipsisPath(*__pCurrentFolderPath);
-               Rectangle rect(INIT_VALUE, INIT_VALUE, GetWidth(), 42);
+                       String ellipisiPath = CommonUtil::SetHighDepthToEllipsisPath(*__pCurrentFolderPath);
+                       Rectangle rect(INIT_VALUE, INIT_VALUE, GetWidth(), 42);
 
-               Label* pAdditionalInfo = new (std::nothrow) Label();
-               if (!IsFailed(pAdditionalInfo->Construct(rect, ellipisiPath)))
-               {
-                       pAdditionalInfo->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
-                       pAdditionalInfo->SetTextVerticalAlignment(ALIGNMENT_MIDDLE);
-                       pAdditionalInfo->SetTextConfig(32, LABEL_TEXT_STYLE_BOLD);
-                       pAdditionalInfo->SetTextColor(COLOR_ITEM_SUB_TEXT);
+                       Label* pAdditionalInfo = new (std::nothrow) Label();
+                       if (!IsFailed(pAdditionalInfo->Construct(rect, ellipisiPath)))
+                       {
+                               pAdditionalInfo->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
+                               pAdditionalInfo->SetTextVerticalAlignment(ALIGNMENT_MIDDLE);
+                               pAdditionalInfo->SetTextConfig(32, LABEL_TEXT_STYLE_BOLD);
+                               pAdditionalInfo->SetTextColor(COLOR_ITEM_SUB_TEXT);
 
-                       SetExtraInformaionArea(*pAdditionalInfo);
+                               SetExtraInformaionArea(*pAdditionalInfo);
+                       }
                }
 
                SetHeader();