Fixed Jira issues 50249, 50683, 50387

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

diff --git a/src/MpAlbumListEditorPanel.cpp b/src/MpAlbumListEditorPanel.cpp
index 3521081..b6a6adc 100644 (file)
--- a/src/MpAlbumListEditorPanel.cpp
+++ b/src/MpAlbumListEditorPanel.cpp
@@ -152,6 +152,30 @@ AlbumListEditorPanel::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previo
 
        UpdateContentEditScreenState();
 
+       if (previousSceneId.Equals(IDSCN_PLAYLIST_CREATOR, true))
+       {
+               if (pArgs != null)
+               {
+                       int totalCount = 0;
+                       __pContentTableView->UpdateTableView();
+                       __checkedItemCount = INIT_VALUE;
+                       SetCheckedCountBallonTooltip(__checkedItemCount);
+
+                       totalCount = __pPresentationModel->GetAllAlbumCount();
+                       for (int count = 0; count < totalCount; count++)
+                       {
+                               __pContentTableView->SetItemChecked(count, false);
+                       }
+               }
+               else
+               {
+                       if (pFooter != null)
+                       {
+                               CommonUtil::SetFooterItemEnabled(*pFooter, true);
+                       }
+               }
+       }
+
        if (pArgs != null)
        {
                pArgs->RemoveAll(true);
@@ -170,23 +194,27 @@ AlbumListEditorPanel::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& curre
        Form* pForm = dynamic_cast<Form*>(GetParent());
        AppAssert(pForm);
 
-       Footer* pFooter = pForm->GetFooter();
-
-       if (pFooter != null)
+       if (!(nextSceneId.Equals(IDSCN_PLAYLIST_CREATOR, false)))
        {
-               pFooter->RemoveAllButtons();
-               pFooter->RemoveAllItems();
-               pFooter->RemoveActionEventListener(*this);
-       }
+               Footer* pFooter = pForm->GetFooter();
 
-       __checkedItemCount = INIT_VALUE;
-       SetCheckedCountBallonTooltip(__checkedItemCount);
+               if (pFooter != null)
+               {
+                       pFooter->RemoveAllButtons();
+                       pFooter->RemoveAllItems();
+                       pFooter->RemoveActionEventListener(*this);
+               }
 
-       int totalCount = __pPresentationModel->GetAllAlbumCount();
-       for (int iCount = 0; iCount < totalCount; iCount++)
-       {
-               __pContentTableView->SetItemChecked(iCount, false);
+               __checkedItemCount = INIT_VALUE;
+               SetCheckedCountBallonTooltip(__checkedItemCount);
+
+               int totalCount = __pPresentationModel->GetAllAlbumCount();
+               for (int iCount = 0; iCount < totalCount; iCount++)
+               {
+                       __pContentTableView->SetItemChecked(iCount, false);
+               }
        }
+
        CancelAllThumbnailRequest();
        AppLogDebug("EXIT");
 }