Landscape implementation Gallery
[apps/osp/Gallery.git] / src / GlFileListEditorForm.cpp
index 7e1488e..fd8cd3e 100644 (file)
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
-// Licensed under the Flora License, Version 1.0 (the License);
+// Licensed under the Flora License, Version 1.1 (the License);
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
 #include "GlImageListEditorPanel.h"
 #include "GlResourceManager.h"
 #include "GlSlideSettingListener.h"
+#include "GlSlideShowPopUp.h"
 #include "GlTypes.h"
 #include "GlVideoListEditorPanel.h"
 #include "GlFileMoveTimer.h"
 
-
 using namespace Tizen::App;
 using namespace Tizen::Base;
 using namespace Tizen::Base::Collection;
 using namespace Tizen::Content;
 using namespace Tizen::Graphics;
+using namespace Tizen::System;
 using namespace Tizen::Ui;
 using namespace Tizen::Ui::Controls;
 using namespace Tizen::Ui::Scenes;
 using namespace Tizen::Base::Utility;
 
 static const int GAP_W_POPUP_ITEM = 5;
-static const int W_DELETE_POPUP = 600;
+static const int W_DELETE_POPUP = 620;
 static const int H_DELETE_POPUP = 300;
 static const int H_DELETE_LABEL = 180;
 static const int Y_DELETE_BUTTON = 180;
@@ -54,21 +55,22 @@ static const unsigned int COLOR_DELETE_BUTTON_NORMAL = Color32<208, 82, 82>::Val
 static const unsigned int COLOR_DELETE_BUTTON_PRESSED = Color32<194, 71, 71>::Value;
 static const unsigned int COLOR_DELETE_BUTTON_TEXT = Color32<248, 246, 239>::Value;
 
+static const String RESERVED_MEDIA_PATH = Environment::GetMediaPath();
+
 FileListEditorForm::FileListEditorForm(void)
-       : __pContextMenuMore(null)
-       , __pContextMenuShare(null)
-       , __pContextEditorMenuMove(null)
-       , __pContextSelectionMenuMove(null)
+       : __pContextMenuShare(null)
+       , __pOptionMenu(null)
        , __pDeletePopup(null)
        , __morePosition(Point(0, 0))
        , __pContentDirectoryList(null)
        , __pContentDirectoryNameList(null)
-       , __pPresentationModel(null)
+       , __pPopUp(null)
        , __pFileMove(null)
-       ,__isCopyOperation(false)
+       , __isCopyOperation(false)
+       , __pPresentationModel(null)
 {
        AppLogDebug("ENTER");
-       __overlayMsg = false;
+       _overlayMsg = false;
        AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
 }
 
@@ -79,6 +81,7 @@ FileListEditorForm::~FileListEditorForm(void)
        {
                delete __pContentDirectoryList;
        }
+
        if (__pContentDirectoryNameList != null)
        {
                delete __pContentDirectoryNameList;
@@ -91,7 +94,7 @@ result
 FileListEditorForm::Initialize(void)
 {
        AppLogDebug("ENTER");
-       result r = Construct(FORM_STYLE_NORMAL | FORM_STYLE_INDICATOR | FORM_STYLE_HEADER | FORM_STYLE_FOOTER);
+       result r = Construct(FORM_STYLE_NORMAL | FORM_STYLE_HEADER | FORM_STYLE_FOOTER);
        AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
 
        return r;
@@ -104,13 +107,16 @@ FileListEditorForm::OnInitializing(void)
        Header* pHeader = GetHeader();
        TryReturn(pHeader != null, E_FAILURE, "[%s] fail to get the header.", GetErrorMessage(GetLastResult()));
 
+       SetOrientation(ORIENTATION_AUTOMATIC);
+       AddOrientationEventListener(*this);
+
        __pPopUp = new (std::nothrow) SlideShowPopUp();
 
        if (__pPopUp != null)
        {
                __pPopUp->Initialize();
                __pPopUp->SetEventListner(this);
-               AddControl(*__pPopUp);
+               AddControl(__pPopUp);
        }
 
        __pPresentationModel = FileListPresentationModel::GetInstance();
@@ -119,13 +125,13 @@ FileListEditorForm::OnInitializing(void)
        pHeader->SetStyle(HEADER_STYLE_TITLE);
        pHeader->SetTitleText(ResourceManager::GetString(L"IDS_COM_BODY_EDIT"));
 
-       if ((__pPresentationModel->GetAppControlMode() == APP_CONTROL_MODE_PICK
+       if ((__pPresentationModel->GetAppControlMode() == APPCONTROL_MODE_PICK
                && __pPresentationModel->GetAppControlSelectionMode() == APPCONTROL_SELECTION_MODE_SINGLE) == false)
        {
                Bitmap* pNormalBitmap = ResourceManager::GetBitmapN(IDB_ICON_SELECT_ALL);
                Bitmap* pPressBitmap = ResourceManager::GetBitmapN(IDB_ICON_SELECT_ALL_PRESS);
                ButtonItem selectAll;
-               selectAll.Construct(BUTTON_ITEM_STYLE_ICON, ACTION_ID_FILE_LIST_SELECT_ALL);
+               selectAll.Construct(BUTTON_ITEM_STYLE_ICON, IDA_FILE_LIST_SELECT_ALL);
                selectAll.SetIcon(BUTTON_ITEM_STATUS_NORMAL, pNormalBitmap);
                selectAll.SetIcon(BUTTON_ITEM_STATUS_PRESSED, pPressBitmap);
                pHeader->SetButton(BUTTON_POSITION_LEFT, selectAll);
@@ -151,14 +157,14 @@ FileListEditorForm::InitializeFooter(void)
 
        result r = E_SUCCESS;
 
-       if (__pPresentationModel->GetAppControlMode() == APP_CONTROL_MODE_PICK)
+       if (__pPresentationModel->GetAppControlMode() == APPCONTROL_MODE_PICK)
        {
                if (__pPresentationModel->GetAppControlSelectionMode() == APPCONTROL_SELECTION_MODE_MULTIPLE)
                {
                        pFooter->SetStyle(FOOTER_STYLE_BUTTON_TEXT);
 
                        FooterItem footerConfirm;
-                       footerConfirm.Construct(ACTION_ID_FOOTER_CONFIRM);
+                       footerConfirm.Construct(IDA_FOOTER_CONFIRM);
                        footerConfirm.SetText(ResourceManager::GetString(L"IDS_COM_SK_DONE"));
                        pFooter->AddItem(footerConfirm);
                        pFooter->SetItemEnabled(0, false);
@@ -167,35 +173,22 @@ FileListEditorForm::InitializeFooter(void)
                {
                        pFooter->SetStyle(FOOTER_STYLE_SEGMENTED_TEXT);
                }
-               pFooter->SetBackButton();
+
                SetFormBackEventListener(this);
+
        }
        else
        {
                pFooter->SetStyle(FOOTER_STYLE_BUTTON_ICON_TEXT);
-
-               ButtonItem footerMore;
-               footerMore.Construct(BUTTON_ITEM_STYLE_ICON, ACTION_ID_FOOTER_MORE);
-               Bitmap* pBitmapMore = ResourceManager::GetBitmapN(IDB_CONTROLBAR_MORE);
-               Bitmap* pBitmapMoreDim = ResourceManager::GetBitmapN(IDB_CONTROLBAR_MORE_DISABLED);
-
-               if (pBitmapMore != null && pBitmapMoreDim != NULL)
-               {
-                       footerMore.SetIcon(BUTTON_ITEM_STATUS_NORMAL, pBitmapMore);
-                       footerMore.SetIcon(BUTTON_ITEM_STATUS_DISABLED, pBitmapMoreDim);
-               }
-               pFooter->SetButton(BUTTON_POSITION_LEFT,footerMore);
-
-               delete pBitmapMore;
-               delete pBitmapMoreDim;
+               SetFormMenuEventListener(this);
 
                FooterItem footerShare;
-               r = footerShare.Construct(ACTION_ID_FOOTER_SHARE);
+               r = footerShare.Construct(IDA_FOOTER_SHARE);
                TryReturn(r == E_SUCCESS, r, "[%s] Unable to construct footer item", GetErrorMessage(r));
                Bitmap* pBitmapShare = ResourceManager::GetBitmapN(IDB_CONTROLBAR_SHARE);
                Bitmap* pBitmapShareDim = ResourceManager::GetBitmapN(IDB_CONTROLBAR_SHARE_DIM);
 
-               if (pBitmapShare != null &&  pBitmapShareDim != null)
+               if (pBitmapShare != null && pBitmapShareDim != null)
                {
                        footerShare.SetIcon(FOOTER_ITEM_STATUS_NORMAL, pBitmapShare);
                        footerShare.SetIcon(FOOTER_ITEM_STATUS_DISABLED, pBitmapShareDim);
@@ -207,7 +200,7 @@ FileListEditorForm::InitializeFooter(void)
                TryReturn(r == E_SUCCESS, r, "[%s] Unable to add item", GetErrorMessage(r));
 
                FooterItem footerDelete;
-               r = footerDelete.Construct(ACTION_ID_FOOTER_DELETE);
+               r = footerDelete.Construct(IDA_FOOTER_DELETE);
                TryReturn(r == E_SUCCESS, r, "[%s] Unable to construct footer item", GetErrorMessage(r));
                Bitmap* pBitmapDelete = ResourceManager::GetBitmapN(IDB_CONTROLBAR_DELETE);
                Bitmap* pBitmapDeleteDim = ResourceManager::GetBitmapN(IDB_CONTROLBAR_DELETE_DIM);
@@ -223,7 +216,6 @@ FileListEditorForm::InitializeFooter(void)
                delete pBitmapDeleteDim;
                TryReturn(r == E_SUCCESS, r, "[%s] Unable to add item", GetErrorMessage(r));
 
-               pFooter->SetBackButton();
                SetFormBackEventListener(this);
 
                SceneManager* pSceneManager = SceneManager::GetInstance();
@@ -248,48 +240,29 @@ FileListEditorForm::InitializeFooter(void)
 
                AppLogDebug("GetItemCheckedCount(%d)", checkedCount);
 
-               if (__pContextMenuMore != null)
+               if (__pOptionMenu != null)
                {
-                       delete __pContextMenuMore;
-                       __pContextMenuMore = null;
+                       delete __pOptionMenu;
+                       __pOptionMenu = null;
                }
 
-               __pContextMenuMore = new (std::nothrow) ContextMenu();
-               __pContextMenuMore->Construct(Point(0, 0), CONTEXT_MENU_STYLE_LIST);
-
-               __pContextMenuMore->AddItem(ResourceManager::GetString(L"IDS_COM_BODY_MOVE"),
-                               ACTION_ID_CONTEXT_MENU_MORE_MOVE);
-               __pContextMenuMore->AddItem(ResourceManager::GetString(L"IDS_COM_BODY_COPY"),
-                                               ACTION_ID_CONTEXT_MENU_MORE_COPY);
+               __pOptionMenu = new (std::nothrow) OptionMenu();
+               __pOptionMenu->Construct();
+               __pOptionMenu->AddItem(ResourceManager::GetString(L"IDS_COM_BODY_MOVE"),
+                               IDA_CONTEXT_MENU_MORE_MOVE);
+               __pOptionMenu->AddItem(ResourceManager::GetString(L"IDS_COM_BODY_COPY"),
+                               IDA_CONTEXT_MENU_MORE_COPY);
 
                if (checkedCount > 1)
                {
-                       __pContextMenuMore->AddItem(ResourceManager::GetString(L"IDS_MEDIABR_BUTTON_SLIDE_SHOW"),
-                                       ACTION_ID_CONTEXT_MENU_MORE_SLIDE_SHOW);
+                       __pOptionMenu->AddItem(ResourceManager::GetString(L"IDS_MEDIABR_OPT_SLIDESHOW"),
+                                       IDA_CONTEXT_MENU_MORE_SLIDE_SHOW);
                }
 
-               __pContextMenuMore->AddItem(ResourceManager::GetString(L"IDS_IV_OPT_ROTATE_LEFT"),ACTION_ID_CONTEXT_MENU_ROTATE_LEFT);
-               __pContextMenuMore->AddItem(ResourceManager::GetString(L"IDS_IV_OPT_ROTATE_RIGHT"),ACTION_ID_CONTEXT_MENU_ROTATE_RIGHT);
-
-               __pContextMenuMore->SetShowState(false);
-               __pContextMenuMore->AddActionEventListener(*this);
+               __pOptionMenu->AddItem(ResourceManager::GetString(L"IDS_IV_OPT_ROTATE_LEFT"),IDA_CONTEXT_MENU_ROTATE_LEFT);
+               __pOptionMenu->AddItem(ResourceManager::GetString(L"IDS_IV_OPT_ROTATE_RIGHT"),IDA_CONTEXT_MENU_ROTATE_RIGHT);
 
-               __pContextMenuShare = new (std::nothrow) ContextMenu();
-               __pContextMenuShare->Construct(Point(0, 0), CONTEXT_MENU_STYLE_LIST);
-               __pContextMenuShare->AddItem(ResourceManager::GetString(L"IDS_COM_BODY_MESSAGE"),
-                               ACTION_ID_CONTEXT_MENU_SHARE_MESSAGE);
-               __pContextMenuShare->AddItem(ResourceManager::GetString(L"IDS_COM_BODY_EMAIL"),
-                               ACTION_ID_CONTEXT_MENU_SHARE_EMAIL);
-               __pContextMenuShare->SetShowState(false);
-               __pContextMenuShare->AddActionEventListener(*this);
-
-               __pContextEditorMenuMove = new (std::nothrow) ContextMenu();
-               __pContextEditorMenuMove->Construct(Point(0, 0), CONTEXT_MENU_STYLE_LIST);
-               __pContextEditorMenuMove->AddActionEventListener(*this);
-
-               __pContextSelectionMenuMove = new (std::nothrow) ContextMenu();
-               __pContextSelectionMenuMove->Construct(Point(0, 0), CONTEXT_MENU_STYLE_LIST);
-               __pContextSelectionMenuMove->AddActionEventListener(*this);
+               __pOptionMenu->AddActionEventListener(*this);
 
                if (__pContentDirectoryNameList != null)
                {
@@ -332,12 +305,13 @@ result
 FileListEditorForm::OnTerminating(void)
 {
        AppLogDebug("ENTER");
+       __pPresentationModel->RemoveContentEventListener(this);
 
-       if (__pContextMenuMore != null)
+       if (__pOptionMenu != null)
        {
-               __pContextMenuMore->RemoveActionEventListener(*this);
-               delete __pContextMenuMore;
-               __pContextMenuMore = null;
+               __pOptionMenu->RemoveActionEventListener(*this);
+               delete __pOptionMenu;
+               __pOptionMenu = null;
        }
 
        if (__pContextMenuShare != null)
@@ -347,26 +321,12 @@ FileListEditorForm::OnTerminating(void)
                __pContextMenuShare = null;
        }
 
-       if (__pContextEditorMenuMove != null)
-       {
-               __pContextEditorMenuMove->RemoveActionEventListener(*this);
-               delete __pContextEditorMenuMove;
-               __pContextEditorMenuMove = null;
-       }
-
-       if (__pContextSelectionMenuMove != null)
-       {
-               __pContextSelectionMenuMove->RemoveActionEventListener(*this);
-               delete __pContextSelectionMenuMove;
-               __pContextSelectionMenuMove = null;
-       }
-
        if (__pDeletePopup != null)
        {
                delete __pDeletePopup;
                __pDeletePopup = null;
        }
-       __overlayMsg = false;
+       _overlayMsg = false;
        AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
 
        return E_SUCCESS;
@@ -381,57 +341,45 @@ FileListEditorForm::OnActionPerformed(const Control& source, int actionId)
 
        switch (actionId)
        {
-       case ACTION_ID_FILE_LIST_SELECT_ALL:
+       case IDA_FILE_LIST_SELECT_ALL:
                SelectAllPressed();
-               break;
-       case ACTION_ID_FOOTER_MORE:
-       {
-               InitializeFooter();
+       break;
 
-               if (__pContextMenuMore->GetShowState() == false)
-               {
-                       Rectangle rect = source.GetBounds();
-                       __morePosition = Point(rect.width/8,rect.y);
-                       if (pSceneManager->GetCurrentSceneId() == IDSCN_ALL_LIST_SELECTION)
-                       {
-                               __pContextMenuMore->SetAnchorPosition(Point(rect.width/10,rect.y));
-                       }
-                       else
-                       {
-                               __pContextMenuMore->SetAnchorPosition(Point(rect.width/10,rect.y - H_TOAST_LABEL));
-                       }
-                       __pContextMenuMore->SetShowState(true);
-                       __pContextMenuMore->Show();
-               }
-               else
-               {
-                       __pContextMenuMore->SetShowState(false);
-               }
-               break;
-       }
-       case ACTION_ID_FOOTER_SHARE:
+       case IDA_FOOTER_SHARE:
        {
-               if (__pContextMenuShare->GetShowState() == false)
+               if ( __pContextMenuShare != NULL)
                {
+                       delete __pContextMenuShare;
+                       __pContextMenuShare = null;
+               }
+
+               __pContextMenuShare = new (std::nothrow) ContextMenu();
+               __pContextMenuShare->Construct(Point(GetClientAreaBounds().width/3 + 15, GetClientAreaBounds().height), CONTEXT_MENU_STYLE_LIST , CONTEXT_MENU_ANCHOR_DIRECTION_UPWARD);
+               __pContextMenuShare->AddItem(ResourceManager::GetString(L"IDS_COM_BODY_MESSAGE"),
+                               IDA_CONTEXT_MENU_SHARE_MESSAGE);
+               __pContextMenuShare->AddItem(ResourceManager::GetString(L"IDS_COM_BODY_EMAIL"),
+                               IDA_CONTEXT_MENU_SHARE_EMAIL);
+               __pContextMenuShare->AddActionEventListener(*this);
+
+
+
                        Rectangle rect = source.GetBounds();
                        if (pSceneManager->GetCurrentSceneId() == IDSCN_ALL_LIST_SELECTION)
                        {
-                               __pContextMenuShare->SetAnchorPosition(Point(rect.width/8*3 ,rect.y));
+                               __pContextMenuShare->SetAnchorPosition(Point(rect.width / 8 * 3, rect.y));
                        }
                        else
                        {
-                               __pContextMenuShare->SetAnchorPosition(Point(rect.width/8*3 ,rect.y - H_TOAST_LABEL));
+                               __pContextMenuShare->SetAnchorPosition(Point(rect.width / 8 * 3, rect.y - H_TOAST_LABEL));
                        }
+
                        __pContextMenuShare->SetShowState(true);
                        __pContextMenuShare->Show();
-               }
-               else
-               {
-                       __pContextMenuShare->SetShowState(false);
-               }
-               break;
+
        }
-       case ACTION_ID_FOOTER_DELETE:
+       break;
+
+       case IDA_FOOTER_DELETE:
        {
                if (pSceneManager->GetCurrentSceneId() == IDSCN_ALL_LIST_EDITOR)
                {
@@ -440,7 +388,7 @@ FileListEditorForm::OnActionPerformed(const Control& source, int actionId)
                        {
                                __pDeletePopup->SetShowState(true);
                                __pDeletePopup->Show();
-                               __overlayMsg = true;
+                               _overlayMsg = true;
                        }
                }
                else if (pSceneManager->GetCurrentSceneId() == IDSCN_IMAGE_LIST_EDITOR)
@@ -450,7 +398,7 @@ FileListEditorForm::OnActionPerformed(const Control& source, int actionId)
                        {
                                __pDeletePopup->SetShowState(true);
                                __pDeletePopup->Show();
-                               __overlayMsg = true;
+                               _overlayMsg = true;
                        }
                }
                else if (pSceneManager->GetCurrentSceneId() == IDSCN_VIDEO_LIST_EDITOR)
@@ -460,7 +408,7 @@ FileListEditorForm::OnActionPerformed(const Control& source, int actionId)
                        {
                                __pDeletePopup->SetShowState(true);
                                __pDeletePopup->Show();
-                               __overlayMsg = true;
+                               _overlayMsg = true;
                        }
                }
                if (pSceneManager->GetCurrentSceneId() == IDSCN_ALL_LIST_SELECTION)
@@ -471,71 +419,55 @@ FileListEditorForm::OnActionPerformed(const Control& source, int actionId)
                        {
                                __pDeletePopup->SetShowState(true);
                                __pDeletePopup->Show();
-                               __overlayMsg = true;
+                               _overlayMsg = true;
                        }
                }
-               break;
        }
-       case ACTION_ID_CONTEXT_MENU_MORE_EDIT:
+       break;
+
+       case IDA_CONTEXT_MENU_MORE_EDIT:
        {
                break;
        }
-       case ACTION_ID_CONTEXT_MENU_MORE_ADD_TAG:
+
+       case IDA_CONTEXT_MENU_MORE_ADD_TAG:
        {
                break;
        }
-       case ACTION_ID_CONTEXT_MENU_MORE_COPY:
-       case ACTION_ID_CONTEXT_MENU_MORE_MOVE:
+
+       case IDA_CONTEXT_MENU_MORE_COPY:
+
+       case IDA_CONTEXT_MENU_MORE_MOVE:
        {
-               if (actionId == ACTION_ID_CONTEXT_MENU_MORE_MOVE)
+               if (actionId == IDA_CONTEXT_MENU_MORE_MOVE)
                {
                        __isCopyOperation = false;
                }
-               else if (actionId == ACTION_ID_CONTEXT_MENU_MORE_COPY)
+               else if (actionId == IDA_CONTEXT_MENU_MORE_COPY)
                {
                        __isCopyOperation = true;
                }
+
                RefreshFolderList();
-               if (pSceneManager->GetCurrentSceneId() == IDSCN_ALL_LIST_EDITOR)
-               {
-                       if (__pContextEditorMenuMove->GetShowState() == false)
-                       {
-                               __pContextEditorMenuMove->SetAnchorPosition(__morePosition);
-                               __pContextEditorMenuMove->SetShowState(true);
-                               __pContextEditorMenuMove->Show();
-                       }
-                       else
-                       {
-                               __pContextEditorMenuMove->SetShowState(false);
-                       }
-               }
-               else if (pSceneManager->GetCurrentSceneId() == IDSCN_ALL_LIST_SELECTION)
-               {
-                       if (__pContextSelectionMenuMove->GetShowState() == false)
-                       {
-                               __pContextSelectionMenuMove->SetAnchorPosition(__morePosition);
-                               __pContextSelectionMenuMove->SetShowState(true);
-                               __pContextSelectionMenuMove->Show();
-                       }
-                       else
-                       {
-                               __pContextSelectionMenuMove->SetShowState(false);
-                       }
-               }
 
-               break;
+               __pOptionMenu->SetShowState(true);
+               __pOptionMenu->Show();
+
+
        }
-       case ACTION_ID_CONTEXT_MENU_MORE_SLIDE_SHOW:
+       break;
+
+       case IDA_CONTEXT_MENU_MORE_SLIDE_SHOW:
        {
                if (__pPopUp != null)
                {
                        __pPopUp->SetShowState(true);
                        __pPopUp->Show();
                }
-
-               break;
        }
-       case ACTION_ID_CONTEXT_MENU_SHARE_MESSAGE:
+       break;
+
+       case IDA_CONTEXT_MENU_SHARE_MESSAGE:
        {
                if (pSceneManager->GetCurrentSceneId() == IDSCN_ALL_LIST_EDITOR)
                {
@@ -545,23 +477,6 @@ FileListEditorForm::OnActionPerformed(const Control& source, int actionId)
                                pEditorPanel->OnRequestMessage();
                        }
                }
-               else if (pSceneManager->GetCurrentSceneId() == IDSCN_IMAGE_LIST_EDITOR)
-               {
-                       ImageListEditorPanel* pEditorPanel = dynamic_cast<ImageListEditorPanel*>(pSceneManager->GetCurrentScene()->GetPanel());
-                       if (pEditorPanel != null)
-                       {
-                               pEditorPanel->OnRequestMessage();
-                       }
-               }
-               else if (pSceneManager->GetCurrentSceneId() == IDSCN_VIDEO_LIST_EDITOR)
-               {
-                       VideoListEditorPanel* pEditorPanel = dynamic_cast<VideoListEditorPanel*>(pSceneManager->GetCurrentScene()->GetPanel());
-                       if (pEditorPanel != null)
-                       {
-                               pEditorPanel->OnRequestMessage();
-                       }
-
-               }
                else if (pSceneManager->GetCurrentSceneId() == IDSCN_ALL_LIST_SELECTION)
                {
                        AllListSelectionPanel* pSelectionPanel = dynamic_cast<AllListSelectionPanel*>(pSceneManager->GetCurrentScene()->GetPanel());
@@ -570,9 +485,10 @@ FileListEditorForm::OnActionPerformed(const Control& source, int actionId)
                                pSelectionPanel->OnRequestMessage();
                        }
                }
-               break;
        }
-       case ACTION_ID_CONTEXT_MENU_SHARE_EMAIL:
+       break;
+
+       case IDA_CONTEXT_MENU_SHARE_EMAIL:
        {
                if (pSceneManager->GetCurrentSceneId() == IDSCN_ALL_LIST_EDITOR)
                {
@@ -582,23 +498,6 @@ FileListEditorForm::OnActionPerformed(const Control& source, int actionId)
                                pEditorPanel->OnRequestEmail();
                        }
                }
-               else if (pSceneManager->GetCurrentSceneId() == IDSCN_IMAGE_LIST_EDITOR)
-               {
-                       ImageListEditorPanel* pEditorPanel = dynamic_cast<ImageListEditorPanel*>(pSceneManager->GetCurrentScene()->GetPanel());
-                       if (pEditorPanel != null)
-                       {
-                               pEditorPanel->OnRequestEmail();
-                       }
-               }
-               else if (pSceneManager->GetCurrentSceneId() == IDSCN_VIDEO_LIST_EDITOR)
-               {
-                       VideoListEditorPanel* pEditorPanel = dynamic_cast<VideoListEditorPanel*>(pSceneManager->GetCurrentScene()->GetPanel());
-                       if (pEditorPanel != null)
-                       {
-                               pEditorPanel->OnRequestEmail();
-                       }
-
-               }
                else if (pSceneManager->GetCurrentSceneId() == IDSCN_ALL_LIST_SELECTION)
                {
                        AllListSelectionPanel* pSelectionPanel = dynamic_cast<AllListSelectionPanel*>(pSceneManager->GetCurrentScene()->GetPanel());
@@ -607,9 +506,10 @@ FileListEditorForm::OnActionPerformed(const Control& source, int actionId)
                                pSelectionPanel->OnRequestEmail();
                        }
                }
-               break;
        }
-       case ACTION_ID_CONTEXTMENU_EDITOR_MOVE_CREATE_ALBUM:
+       break;
+
+       case IDA_CONTEXTMENU_EDITOR_MOVE_CREATE_ALBUM:
        {
                if (pSceneManager->GetCurrentSceneId() == IDSCN_ALL_LIST_EDITOR)
                {
@@ -618,43 +518,47 @@ FileListEditorForm::OnActionPerformed(const Control& source, int actionId)
                        {
                                IList* pList = pListEditorPanel->GetItemCheckedIndexListN();
                                pList->InsertAt(new (std::nothrow) Integer(ALBUM_CREATE), ALBUM_FIRST_ELEMENT);
-                               if(__isCopyOperation)
+                               if (__isCopyOperation)
                                {
-                                       pList->InsertAt(new (std::nothrow) Integer(FILE_COPY_ACTION), ALBUM_SECOND_ELEMENT);
+                                       pList->InsertAt(new (std::nothrow) Integer(FILE_ACTION_COPY), ALBUM_SECOND_ELEMENT);
                                }
                                else
                                {
-                                       pList->InsertAt(new (std::nothrow) Integer(FILE_MOVE_ACTION), ALBUM_SECOND_ELEMENT);
+                                       pList->InsertAt(new (std::nothrow) Integer(FILE_ACTION_MOVE), ALBUM_SECOND_ELEMENT);
                                }
                                pSceneManager->GoForward(ForwardSceneTransition(IDSCN_ALBUM_NAME_EDITOR), pList);
                        }
 
                }
-               break;
-       }
-       case ACTION_ID_CONTEXTMENU_SELECTION_MOVE_CREATE_ALBUM:
-       {
-               if (pSceneManager->GetCurrentSceneId() == IDSCN_ALL_LIST_SELECTION)
+               else
                {
-                       AllListSelectionPanel* pSelectionPanel = dynamic_cast<AllListSelectionPanel*>
-                       (pSceneManager->GetCurrentScene()->GetPanel());
-                       IList* pList = pSelectionPanel->GetItemCheckedIndexListN();
-                       pList->InsertAt(new (std::nothrow) Integer(ALBUM_CREATE), ALBUM_FIRST_ELEMENT);
-                       if(__isCopyOperation)
-                       {
-                               pList->InsertAt(new (std::nothrow) Integer(FILE_COPY_ACTION), ALBUM_SECOND_ELEMENT);
-                       }
-                       else
+                       if (pSceneManager->GetCurrentSceneId() == IDSCN_ALL_LIST_SELECTION)
                        {
-                               pList->InsertAt(new (std::nothrow) Integer(FILE_MOVE_ACTION), ALBUM_SECOND_ELEMENT);
+                               AllListSelectionPanel* pSelectionPanel = dynamic_cast<AllListSelectionPanel*>
+                               (pSceneManager->GetCurrentScene()->GetPanel());
+
+                               if (pSelectionPanel != null)
+                               {
+                                       IList* pList = pSelectionPanel->GetItemCheckedIndexListN();
+                                       pList->InsertAt(new (std::nothrow) Integer(ALBUM_CREATE), ALBUM_FIRST_ELEMENT);
+                                       if (__isCopyOperation)
+                                       {
+                                               pList->InsertAt(new (std::nothrow) Integer(FILE_ACTION_COPY), ALBUM_SECOND_ELEMENT);
+                                       }
+                                       else
+                                       {
+                                               pList->InsertAt(new (std::nothrow) Integer(FILE_ACTION_MOVE), ALBUM_SECOND_ELEMENT);
+                                       }
+                                       pSceneManager->GoForward(ForwardSceneTransition(IDSCN_ALBUM_NAME_EDITOR), pList);
+                               }
                        }
-                       pSceneManager->GoForward(ForwardSceneTransition(IDSCN_ALBUM_NAME_EDITOR), pList);
                }
-               break;
        }
-       case ACTION_ID_DELETE_POPUP_DEL:
+       break;
+
+       case IDA_DELETE_POPUP_DEL:
        {
-               __overlayMsg = false;
+               _overlayMsg = false;
                __pDeletePopup->SetShowState(false);
                __pDeletePopup->Invalidate(true);
 
@@ -670,24 +574,6 @@ FileListEditorForm::OnActionPerformed(const Control& source, int actionId)
                                }
                        }
                }
-               else if (pSceneManager->GetCurrentSceneId() == IDSCN_IMAGE_LIST_EDITOR)
-               {
-                       ImageListEditorPanel* pEditorPanel = dynamic_cast<ImageListEditorPanel*>(pSceneManager->GetCurrentScene()->GetPanel());
-                       if (pEditorPanel != null)
-                       {
-                               pEditorPanel->OnRequestDelete();
-                       }
-               }
-               else if (pSceneManager->GetCurrentSceneId() == IDSCN_VIDEO_LIST_EDITOR)
-               {
-                       VideoListEditorPanel* pEditorPanel = dynamic_cast<VideoListEditorPanel*>
-                       (pSceneManager->GetCurrentScene()->GetPanel());
-
-                       if (pEditorPanel != null)
-                       {
-                               pEditorPanel->OnRequestDelete();
-                       }
-               }
                else if (pSceneManager->GetCurrentSceneId() == IDSCN_ALL_LIST_SELECTION)
                {
                        AllListSelectionPanel* pSelectionPanel = dynamic_cast<AllListSelectionPanel*>
@@ -702,31 +588,30 @@ FileListEditorForm::OnActionPerformed(const Control& source, int actionId)
                                }
                        }
                }
-               break;
        }
-       case ACTION_ID_DELETE_POPUP_CANCEL:
+       break;
+
+       case IDA_DELETE_POPUP_CANCEL:
        {
-               __overlayMsg = false;
+               _overlayMsg = false;
                __pDeletePopup->SetShowState(false);
                __pDeletePopup->Invalidate(true);
-               break;
        }
+       break;
 
-       case ACTION_ID_CONTEXT_MENU_ROTATE_LEFT:
+       case IDA_CONTEXT_MENU_ROTATE_LEFT:
        {
                if (pSceneManager->GetCurrentSceneId() == IDSCN_ALL_LIST_EDITOR)
                {
-
                        AllListEditorPanel* pEditorPanel = dynamic_cast<AllListEditorPanel*>(pSceneManager->GetCurrentScene()->GetPanel());
                        if (pEditorPanel != null)
                        {
                                RotateMode rotateMode = ROTATE_MODE_LEFT;
-                               pEditorPanel->OnRotateRequested(rotateMode);
+                               pEditorPanel->OnRequestRotate(rotateMode);
                        }
                }
                else if (pSceneManager->GetCurrentSceneId() == IDSCN_ALL_LIST_SELECTION)
                {
-
                        AllListSelectionPanel* pSelectionPanel = dynamic_cast<AllListSelectionPanel*>
                        (pSceneManager->GetCurrentScene()->GetPanel());
 
@@ -735,13 +620,11 @@ FileListEditorForm::OnActionPerformed(const Control& source, int actionId)
                                RotateMode rotateMode = ROTATE_MODE_LEFT;
                                pSelectionPanel->OnRotateRequested(rotateMode);
                        }
-
                }
-
-               break;
        }
+       break;
 
-       case ACTION_ID_CONTEXT_MENU_ROTATE_RIGHT:
+       case IDA_CONTEXT_MENU_ROTATE_RIGHT:
        {
                if (pSceneManager->GetCurrentSceneId() == IDSCN_ALL_LIST_EDITOR)
                {
@@ -749,7 +632,7 @@ FileListEditorForm::OnActionPerformed(const Control& source, int actionId)
                        if (pEditorPanel != null)
                        {
                                RotateMode rotateMode = ROTATE_MODE_RIGHT;
-                               pEditorPanel->OnRotateRequested(rotateMode);
+                               pEditorPanel->OnRequestRotate(rotateMode);
                        }
                }
                else if (pSceneManager->GetCurrentSceneId() == IDSCN_ALL_LIST_SELECTION)
@@ -764,11 +647,10 @@ FileListEditorForm::OnActionPerformed(const Control& source, int actionId)
                                pSelectionPanel->OnRotateRequested(rotateMode);
                        }
                }
-
-               break;
        }
+       break;
 
-       case ACTION_ID_FOOTER_CONFIRM:
+       case IDA_FOOTER_CONFIRM:
        {
                if (pSceneManager->GetCurrentSceneId() == IDSCN_IMAGE_LIST_EDITOR)
                {
@@ -786,24 +668,24 @@ FileListEditorForm::OnActionPerformed(const Control& source, int actionId)
                                pEditorPanel->OnRequestAppExitWithMultipleSelectionAppControlResult();
                        }
                }
-               break;
        }
+       break;
+
        default:
        {
                if (pSceneManager->GetCurrentSceneId() == IDSCN_ALL_LIST_EDITOR)
                {
-                       if ((ACTION_ID_CONTEXTMENU_EDITOR_MOVE_ALBUM_ARRAY_START <= actionId) &&
-                                       (actionId <= ACTION_ID_CONTEXTMENU_EDITOR_MOVE_CREATE_ALBUM + 1000))
+                       if ((IDA_CONTEXTMENU_EDITOR_MOVE_ALBUM_ARRAY_START <= actionId) &&
+                                       (actionId <= IDA_CONTEXTMENU_EDITOR_MOVE_CREATE_ALBUM + 1000))
                        {
                                if (__pContentDirectoryList == null)
                                {
-
                                        return;
                                }
-                               if (__pContentDirectoryList->GetCount() > actionId - ACTION_ID_CONTEXTMENU_EDITOR_MOVE_ALBUM_ARRAY_START)
+                               if (__pContentDirectoryList->GetCount() > actionId - IDA_CONTEXTMENU_EDITOR_MOVE_ALBUM_ARRAY_START)
                                {
                                        String* pDirectory = static_cast<String*>
-                                       (__pContentDirectoryList->GetAt(actionId - ACTION_ID_CONTEXTMENU_EDITOR_MOVE_ALBUM_ARRAY_START));
+                                       (__pContentDirectoryList->GetAt(actionId - IDA_CONTEXTMENU_EDITOR_MOVE_ALBUM_ARRAY_START));
 
                                        AllListEditorPanel* pEditorPanel = dynamic_cast<AllListEditorPanel*>
                                        (pSceneManager->GetCurrentScene()->GetPanel());
@@ -813,8 +695,8 @@ FileListEditorForm::OnActionPerformed(const Control& source, int actionId)
                                                delete __pFileMove;
                                                IList* pItemIndexList = pEditorPanel->GetItemCheckedIndexListN();
                                                GetMoveFileIndexList(*pDirectory, pItemIndexList, __pPresentationModel);
-                                               __pFileMove = new FileMoveTimer(*pDirectory, pItemIndexList, __pPresentationModel, this);
-                                               if(__isCopyOperation)
+                                               __pFileMove = new (std::nothrow) FileMoveTimer(*pDirectory, pItemIndexList, __pPresentationModel, this);
+                                               if (__isCopyOperation)
                                                {
                                                        AppLogDebug("Rash: Setting to Copy in FileListEditorForm");
                                                        __pFileMove->SetCopy();
@@ -829,7 +711,7 @@ FileListEditorForm::OnActionPerformed(const Control& source, int actionId)
                                                }
                                                else
                                                {
-                                                       __overlayMsg = true;
+                                                       _overlayMsg = true;
                                                }
                                        }
                                }
@@ -837,18 +719,18 @@ FileListEditorForm::OnActionPerformed(const Control& source, int actionId)
                }
                else if (pSceneManager->GetCurrentSceneId() == IDSCN_ALL_LIST_SELECTION)
                {
-                       if ((ACTION_ID_CONTEXTMENU_SELECTION_MOVE_ALBUM_ARRAY_START <= actionId) &&
-                                       (actionId <= ACTION_ID_CONTEXTMENU_SELECTION_MOVE_CREATE_ALBUM + 1000))
+                       if ((IDA_CONTEXTMENU_SELECTION_MOVE_ALBUM_ARRAY_START <= actionId) &&
+                                       (actionId <= IDA_CONTEXTMENU_EDITOR_MOVE_CREATE_ALBUM + 1000))
                        {
                                if (__pContentDirectoryList == null)
                                {
 
                                        return;
                                }
-                               if (__pContentDirectoryList->GetCount() > actionId - ACTION_ID_CONTEXTMENU_SELECTION_MOVE_ALBUM_ARRAY_START)
+                               if (__pContentDirectoryList->GetCount() > actionId - IDA_CONTEXTMENU_SELECTION_MOVE_ALBUM_ARRAY_START)
                                {
                                        String* pDirectory = static_cast<String*>
-                                       (__pContentDirectoryList->GetAt(actionId - ACTION_ID_CONTEXTMENU_SELECTION_MOVE_ALBUM_ARRAY_START));
+                                       (__pContentDirectoryList->GetAt(actionId - IDA_CONTEXTMENU_SELECTION_MOVE_ALBUM_ARRAY_START));
 
                                        AllListSelectionPanel* pSelectionPanel = dynamic_cast<AllListSelectionPanel*>
                                                (pSceneManager->GetCurrentScene()->GetPanel());
@@ -858,8 +740,8 @@ FileListEditorForm::OnActionPerformed(const Control& source, int actionId)
                                                delete __pFileMove;
                                                IList* pItemIndexList = pSelectionPanel->GetItemCheckedIndexListN();
                                                GetMoveFileIndexList(*pDirectory, pItemIndexList, __pPresentationModel);
-                                               __pFileMove = new FileMoveTimer(*pDirectory, pItemIndexList, __pPresentationModel, this);
-                                               if(__isCopyOperation)
+                                               __pFileMove = new (std::nothrow) FileMoveTimer(*pDirectory, pItemIndexList, __pPresentationModel, this);
+                                               if (__isCopyOperation)
                                                {
                                                        AppLogDebug("Rash: Setting to Copy in FileListEditorForm");
                                                        __pFileMove->SetCopy();
@@ -873,7 +755,7 @@ FileListEditorForm::OnActionPerformed(const Control& source, int actionId)
                                                }
                                                else
                                                {
-                                                       __overlayMsg = true;
+                                                       _overlayMsg = true;
                                                }
                                        }
                                }
@@ -885,29 +767,31 @@ FileListEditorForm::OnActionPerformed(const Control& source, int actionId)
        AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
 }
 
-void FileListEditorForm::OnFileOpInvalidate(enum FileActionMode actionId)
+void
+FileListEditorForm::OnFileOpInvalidate(enum FileActionMode actionId)
 {
        Invalidate(true);
 }
 
-bool FileListEditorForm::GetOverlayStatus()
+bool
+FileListEditorForm::GetOverlayStatus(void) const
 {
-       return __overlayMsg;
+       return _overlayMsg;
 }
 
-void FileListEditorForm::OnFileOpComplete(enum FileActionMode actionId, enum FileActionCompleteRes res)
+void
+FileListEditorForm::OnFileOpComplete(enum FileActionMode actionId, enum FileActionCompleteRes res)
 {
-       __overlayMsg = false;
+       _overlayMsg = false;
        __pPresentationModel->SetUpdateProgressStatus(false);
        if (res != COMPLETE_SUCCESS)
        {
                MessageBox messageBox;
-               messageBox.Construct(L"", L"System error",
-                               MSGBOX_STYLE_OK, 3000);
+               messageBox.Construct(L"", ResourceManager::GetString(L"IDS_COM_BODY_OPERATION_FAILED"), MSGBOX_STYLE_OK, 3000);
                int modalResult = 0;
-               __overlayMsg = true;
+               _overlayMsg = true;
                messageBox.ShowAndWait(modalResult);
-               __overlayMsg = false;
+               _overlayMsg = false;
                SceneManager* pSceneManager = SceneManager::GetInstance();
                AppAssert(pSceneManager);
                pSceneManager->GoForward(ForwardSceneTransition(IDSCN_ALL_LIST));
@@ -919,11 +803,49 @@ FileListEditorForm::OnContentUpdated()
 {
        AppLogDebug("ENTER");
 
-       if (__overlayMsg == false)
+       SceneManager* pSceneManager = SceneManager::GetInstance();
+
+       if(__pDeletePopup != null)
        {
-               SceneManager* pSceneManager = SceneManager::GetInstance();
-               pSceneManager->GoForward(ForwardSceneTransition(IDSCN_ALL_LIST));
+               if(__pDeletePopup->IsVisible() == true)
+               {
+                       __pDeletePopup->Destroy();
+                       __pDeletePopup = null;
+                       _overlayMsg = false;
+                       SetUpPopup();
+               }
+       }
+
+       if (pSceneManager->GetCurrentSceneId() == IDSCN_ALL_LIST_EDITOR)
+       {
+               AllListEditorPanel* pEditorPanel = dynamic_cast<AllListEditorPanel*>(pSceneManager->GetCurrentScene()->GetPanel());
+               if (pEditorPanel != null)
+               {
+                       pEditorPanel->CancelUpdateProgress();
+               }
+       }
+       else if (pSceneManager->GetCurrentSceneId() == IDSCN_ALL_LIST_SELECTION)
+       {
+               AllListSelectionPanel* pSelectionPanel = dynamic_cast<AllListSelectionPanel*>(pSceneManager->GetCurrentScene()->GetPanel());
+               if (pSelectionPanel != null)
+               {
+                       pSelectionPanel->CancelUpdateProgress();
+               }
+       }
+
+       if (__pPresentationModel->GetAppControlMode() == APPCONTROL_MODE_PICK
+                       && pSceneManager->GetCurrentSceneId() == IDSCN_IMAGE_LIST_EDITOR)
+       {
+               pSceneManager->GoForward(ForwardSceneTransition(IDSCN_ALBUM_LIST, SCENE_TRANSITION_ANIMATION_TYPE_NONE,
+                               SCENE_HISTORY_OPTION_NO_HISTORY, SCENE_DESTROY_OPTION_DESTROY));
+
+       }
+       else if (_overlayMsg == false)
+       {
+               pSceneManager->GoForward(ForwardSceneTransition(IDSCN_ALL_LIST, SCENE_TRANSITION_ANIMATION_TYPE_NONE,
+                               SCENE_HISTORY_OPTION_NO_HISTORY, SCENE_DESTROY_OPTION_DESTROY));
        }
+
        AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
 }
 
@@ -947,25 +869,26 @@ FileListEditorForm::SetUpPopup(void)
        Label* pLabelText = new (std::nothrow) Label();
        pLabelText->Construct(Rectangle(0, 0, popupClientBounds.width, H_DELETE_LABEL),
                        ResourceManager::GetString(L"IDS_COM_POP_DELETE_Q"));
-       pLabelText->SetTextHorizontalAlignment(ALIGNMENT_CENTER);
-       __pDeletePopup->AddControl(*pLabelText);
+       pLabelText->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
+       pLabelText->SetTextConfig(34,LABEL_TEXT_STYLE_BOLD);
+       __pDeletePopup->AddControl(pLabelText);
 
        Button* pDeleteButton = new (std::nothrow) Button();
-       pDeleteButton->Construct(Rectangle(0, Y_DELETE_BUTTON, popupClientBounds.width / 2 - GAP_W_POPUP_ITEM, H_DELETE_BUTTON),
+       pDeleteButton->Construct(Rectangle(10, Y_DELETE_BUTTON, popupClientBounds.width / 2 - GAP_W_POPUP_ITEM -10, H_DELETE_BUTTON),
                        ResourceManager::GetString(L"IDS_COM_BODY_DELETE"));
        pDeleteButton->SetColor(BUTTON_STATUS_NORMAL, COLOR_DELETE_BUTTON_NORMAL);
        pDeleteButton->SetColor(BUTTON_STATUS_PRESSED, COLOR_DELETE_BUTTON_PRESSED);
        pDeleteButton->SetTextColor(COLOR_DELETE_BUTTON_TEXT);
-       pDeleteButton->SetActionId(ACTION_ID_DELETE_POPUP_DEL);
+       pDeleteButton->SetActionId(IDA_DELETE_POPUP_DEL);
        pDeleteButton->AddActionEventListener(*this);
-       __pDeletePopup->AddControl(*pDeleteButton);
+       __pDeletePopup->AddControl(pDeleteButton);
 
        Button* pButtonCancel = new (std::nothrow) Button();
        pButtonCancel->Construct(Rectangle(popupClientBounds.width / 2 + GAP_W_POPUP_ITEM, Y_DELETE_BUTTON,
-                       popupClientBounds.width / 2 - GAP_W_POPUP_ITEM, H_DELETE_BUTTON), ResourceManager::GetString(L"IDS_COM_POP_CANCEL"));
-       pButtonCancel->SetActionId(ACTION_ID_DELETE_POPUP_CANCEL);
+                       popupClientBounds.width / 2 - GAP_W_POPUP_ITEM -10, H_DELETE_BUTTON), ResourceManager::GetString(L"IDS_COM_POP_CANCEL"));
+       pButtonCancel->SetActionId(IDA_DELETE_POPUP_CANCEL);
        pButtonCancel->AddActionEventListener(*this);
-       __pDeletePopup->AddControl(*pButtonCancel);
+       __pDeletePopup->AddControl(pButtonCancel);
        AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
 
        return r;
@@ -1006,32 +929,45 @@ FileListEditorForm::RefreshFolderList(void)
        __pContentDirectoryNameList = new (std::nothrow) ArrayList(SingleObjectDeleter);
        String* pDirPath = null;
        String* pDirName = null;
+       String mediaPath = RESERVED_MEDIA_PATH;
+       int length = mediaPath.GetLength();
+       mediaPath.Remove(length-1,1);
 
        int loopCount = __pContentDirectoryList->GetCount();
        for (int i = 0; i < loopCount; ++i)
        {
                pDirPath = static_cast<String*>(__pContentDirectoryList->GetAt(i));
                pDirName = new (std::nothrow) String(GetDirecotyNameFromFullPath(*pDirPath));
-               __pContentDirectoryNameList->Add(pDirName);
-       }
-       __pContextEditorMenuMove->RemoveAllItems();
-       __pContextEditorMenuMove->AddItem(ResourceManager::GetString(L"IDS_MEDIABR_OPT_CREATE_ALBUM"),
-                       ACTION_ID_CONTEXTMENU_EDITOR_MOVE_CREATE_ALBUM);
-       __pContextSelectionMenuMove->RemoveAllItems();
-       __pContextSelectionMenuMove->AddItem(ResourceManager::GetString(L"IDS_MEDIABR_OPT_CREATE_ALBUM"),
-                       ACTION_ID_CONTEXTMENU_SELECTION_MOVE_CREATE_ALBUM);
-
-       loopCount = __pContentDirectoryNameList->GetCount();
-       for (int i = 0; i < loopCount; ++i)
-       {
-               pDirName = static_cast<String*>(__pContentDirectoryNameList->GetAt(i));
-               __pContextEditorMenuMove->AddItem(*(new (std::nothrow) String(*pDirName)),
-                               ACTION_ID_CONTEXTMENU_EDITOR_MOVE_ALBUM_ARRAY_START + i);
-               __pContextSelectionMenuMove->AddItem(*(new (std::nothrow) String(*pDirName)),
-                               ACTION_ID_CONTEXTMENU_SELECTION_MOVE_ALBUM_ARRAY_START + i);
+
+               if ( *pDirPath == mediaPath)
+               {
+                       *pDirName = ResourceManager::GetString(L"IDS_MEDIABR_POP_NO_NAME");
+                       __pContentDirectoryNameList->Add(pDirName);
+               }
+               else
+               {
+                       __pContentDirectoryNameList->Add(pDirName);
+               }
        }
-       __pContextEditorMenuMove->SetShowState(false);
-       __pContextSelectionMenuMove->SetShowState(false);
+
+               __pOptionMenu->RemoveAllItems();
+               __pOptionMenu->AddItem(ResourceManager::GetString(L"IDS_MEDIABR_OPT_CREATE_ALBUM"),
+                               IDA_CONTEXTMENU_EDITOR_MOVE_CREATE_ALBUM);
+
+               loopCount = __pContentDirectoryNameList->GetCount();
+
+               for (int i = 0; i < loopCount; ++i)
+               {
+                       pDirName = static_cast<String*>(__pContentDirectoryNameList->GetAt(i));
+
+                       if ( *pDirName != __pPresentationModel->GetCurrentAlbumName())
+                       {
+                               __pOptionMenu->AddItem(*(new (std::nothrow) String(*pDirName)),
+                                               IDA_CONTEXTMENU_EDITOR_MOVE_ALBUM_ARRAY_START + i);
+                       }
+               }
+
+
        AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
 }
 
@@ -1043,7 +979,7 @@ FileListEditorForm::OnFormBackRequested(Form& source)
        SceneManager* pSceneManager = SceneManager::GetInstance();
        TryReturnVoid(pSceneManager != null, "[%s] fail to get SceneManager.", GetErrorMessage(GetLastResult()));
 
-       if (__pPresentationModel->GetAppControlMode() == APP_CONTROL_MODE_PICK)
+       if (__pPresentationModel->GetAppControlMode() == APPCONTROL_MODE_PICK)
        {
                if (pSceneManager->GetCurrentSceneId() == IDSCN_IMAGE_LIST_EDITOR)
                {
@@ -1080,7 +1016,8 @@ FileListEditorForm::OnFormBackRequested(Form& source)
                                        pList = new (std::nothrow) ArrayList(SingleObjectDeleter);
                                }
 
-                               pSceneManager->GoBackward(BackwardSceneTransition(IDSCN_ALL_LIST_EDITOR), pList);
+                               pSceneManager->GoForward(ForwardSceneTransition(IDSCN_ALL_LIST_EDITOR, SCENE_TRANSITION_ANIMATION_TYPE_NONE,
+                                                  SCENE_HISTORY_OPTION_ADD_HISTORY, SCENE_DESTROY_OPTION_DESTROY), pList);
                        }
                }
                else
@@ -1092,13 +1029,13 @@ FileListEditorForm::OnFormBackRequested(Form& source)
 }
 
 void
-FileListEditorForm::SetFooterButtonsState(bool enableState)
+FileListEditorForm::SetFooterButtonsState(const bool enableState)
 {
        AppLogDebug("ENTER");
        Footer* pFooter = GetFooter();
        TryReturnVoid(pFooter != null, "[%s] fail to get the footer.", GetErrorMessage(GetLastResult()));
 
-       if (__pPresentationModel->GetAppControlMode() == APP_CONTROL_MODE_PICK)
+       if (__pPresentationModel->GetAppControlMode() == APPCONTROL_MODE_PICK)
        {
                if (enableState == true)
                {
@@ -1110,19 +1047,16 @@ FileListEditorForm::SetFooterButtonsState(bool enableState)
                        pFooter->SetButtonEnabled(BUTTON_POSITION_LEFT, false);
                        pFooter->SetItemEnabled(0, false);
                }
-
        }
        else
        {
                if (enableState == true)
                {
-                       pFooter->SetButtonEnabled(BUTTON_POSITION_LEFT, true);
                        pFooter->SetItemEnabled(0, true);
                        pFooter->SetItemEnabled(1, true);
                }
                else
                {
-                       pFooter->SetButtonEnabled(BUTTON_POSITION_LEFT, false);
                        pFooter->SetItemEnabled(0, false);
                        pFooter->SetItemEnabled(1, false);
                }
@@ -1131,8 +1065,49 @@ FileListEditorForm::SetFooterButtonsState(bool enableState)
        AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
 }
 
+void
+FileListEditorForm::OnOrientationChanged(const Tizen::Ui::Control &source, Tizen::Ui::OrientationStatus orientationStatus)
+{
+       SceneManager* pSceneManager = SceneManager::GetInstance();
+       pSceneManager->GetCurrentScene();
+
+       if (pSceneManager->GetCurrentSceneId() == IDSCN_ALL_LIST_EDITOR)
+       {
+               AllListEditorPanel* pEditorPanel = dynamic_cast<AllListEditorPanel*>(pSceneManager->GetCurrentScene()->GetPanel());
+               if (pEditorPanel != null)
+               {
+                       pEditorPanel->ChangeOrientation();
+               }
+       }
+       else if (pSceneManager->GetCurrentSceneId() == IDSCN_IMAGE_LIST_EDITOR)
+       {
+               ImageListEditorPanel* pEditorPanel = dynamic_cast<ImageListEditorPanel*>(pSceneManager->GetCurrentScene()->GetPanel());
+               if (pEditorPanel != null)
+               {
+                       pEditorPanel->ChangeOrientation();
+               }
+       }
+       else if (pSceneManager->GetCurrentSceneId() == IDSCN_VIDEO_LIST_EDITOR)
+       {
+               VideoListEditorPanel* pEditorPanel = dynamic_cast<VideoListEditorPanel*>(pSceneManager->GetCurrentScene()->GetPanel());
+               if (pEditorPanel != null)
+               {
+                       pEditorPanel->ChangeOrientation();
+               }
+       }
+       else if (pSceneManager->GetCurrentSceneId() == IDSCN_ALL_LIST_SELECTION)
+       {
+               AllListSelectionPanel* pEditorPanel = dynamic_cast<AllListSelectionPanel*>(pSceneManager->GetCurrentScene()->GetPanel());
+               if (pEditorPanel != null)
+               {
+                       pEditorPanel->ChangeOrientation();
+               }
+       }
+}
+
+
 result
-FileListEditorForm::MoveToAlbum(String& destDirectory)
+FileListEditorForm::MoveToAlbum(const String& destDirectory)
 {
        AppLogDebug("ENTER");
        result r = E_FAILURE;
@@ -1165,7 +1140,7 @@ FileListEditorForm::SelectAllPressed(void)
                AllListEditorPanel* pEditorPanel = dynamic_cast<AllListEditorPanel*>(pSceneManager->GetCurrentScene()->GetPanel());
                if (pEditorPanel != null)
                {
-                       pEditorPanel->SelectAllPressed();
+                       pEditorPanel->OnSelectAllPressed();
                }
        }
        else if (pSceneManager->GetCurrentSceneId() == IDSCN_IMAGE_LIST_EDITOR)
@@ -1173,7 +1148,7 @@ FileListEditorForm::SelectAllPressed(void)
                ImageListEditorPanel* pEditorPanel = dynamic_cast<ImageListEditorPanel*>(pSceneManager->GetCurrentScene()->GetPanel());
                if (pEditorPanel != null)
                {
-                       pEditorPanel->SelectAllPressed();
+                       pEditorPanel->OnSelectAllPressed();
                }
        }
        else if (pSceneManager->GetCurrentSceneId() == IDSCN_VIDEO_LIST_EDITOR)
@@ -1181,7 +1156,7 @@ FileListEditorForm::SelectAllPressed(void)
                VideoListEditorPanel* pEditorPanel = dynamic_cast<VideoListEditorPanel*>(pSceneManager->GetCurrentScene()->GetPanel());
                if (pEditorPanel != null)
                {
-                       pEditorPanel->SelectAllPressed();
+                       pEditorPanel->OnSelectAllPressed();
                }
        }
        else if (pSceneManager->GetCurrentSceneId() == IDSCN_ALL_LIST_SELECTION)
@@ -1189,7 +1164,7 @@ FileListEditorForm::SelectAllPressed(void)
                AllListSelectionPanel* pEditorPanel = dynamic_cast<AllListSelectionPanel*>(pSceneManager->GetCurrentScene()->GetPanel());
                if (pEditorPanel != null)
                {
-                       pEditorPanel->SelectAllPressed();
+                       pEditorPanel->OnSelectAllPressed();
                }
        }
 }
@@ -1204,7 +1179,7 @@ FileListEditorForm::OnSlideSettingPopUpItemSelected(int index)
 
        SceneManager* pSceneManager = SceneManager::GetInstance();
 
-       if (index == 0)   // start slide show
+       if (index == 0)
        {
                if (pSceneManager->GetCurrentSceneId() == IDSCN_ALL_LIST_EDITOR)
                {
@@ -1225,7 +1200,7 @@ FileListEditorForm::OnSlideSettingPopUpItemSelected(int index)
                        }
                }
        }
-       else if (index == 1) // go to settingsForm
+       else if (index == 1)
        {
                SceneManager* pSceneManager = SceneManager::GetInstance();
                TryReturnVoid(pSceneManager != null, "[%s] fail to get SceneManager", GetErrorMessage(GetLastResult()));
@@ -1234,3 +1209,75 @@ FileListEditorForm::OnSlideSettingPopUpItemSelected(int index)
        }
 }
 
+void
+FileListEditorForm::OnSceneDeactivated(const SceneId& currentSceneId, const SceneId& nextSceneId)
+{
+       AppLogDebug("ENTER");
+       __pPresentationModel->RemoveContentEventListener(this);
+       AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
+}
+
+void
+FileListEditorForm::OnSceneActivatedN(const SceneId& previousSceneId, const SceneId& currentSceneId, IList* pArgs)
+{
+       AppLogDebug("ENTER");
+       __pPresentationModel->AddContentEventListener(this);
+       AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
+}
+
+void
+FileListEditorForm::OnFormMenuRequested (Tizen::Ui::Controls::Form &source)
+{
+
+       SceneManager* pSceneManager = SceneManager::GetInstance();
+       int checkedCount = 0;
+
+       if (pSceneManager->GetCurrentSceneId() == IDSCN_ALL_LIST_EDITOR)
+       {
+               AllListEditorPanel* pEditorPanel = dynamic_cast<AllListEditorPanel*>(pSceneManager->GetCurrentScene()->GetPanel());
+               if (pEditorPanel != null)
+               {
+                       checkedCount = pEditorPanel->GetItemCheckedCount();
+               }
+       }
+       else if (pSceneManager->GetCurrentSceneId() == IDSCN_ALL_LIST_SELECTION)
+       {
+               AllListSelectionPanel* pSelectionPanel = dynamic_cast<AllListSelectionPanel*>(pSceneManager->GetCurrentScene()->GetPanel());
+               if (pSelectionPanel != null)
+               {
+                       checkedCount = pSelectionPanel->GetItemCheckedCount();
+               }
+       }
+
+       if (__pContextMenuShare != null && __pContextMenuShare->GetShowState() == true )
+       {
+               __pContextMenuShare->SetShowState(false);
+       }
+
+       if ( checkedCount > 0)
+       {
+               if ( __pOptionMenu == null )
+               {
+                       return ;
+               }
+
+               __pOptionMenu->RemoveAllItems();
+               __pOptionMenu->AddItem(ResourceManager::GetString(L"IDS_COM_BODY_MOVE"),
+                               IDA_CONTEXT_MENU_MORE_MOVE);
+               __pOptionMenu->AddItem(ResourceManager::GetString(L"IDS_COM_BODY_COPY"),
+                               IDA_CONTEXT_MENU_MORE_COPY);
+
+               if (checkedCount > 1)
+               {
+                       __pOptionMenu->AddItem(ResourceManager::GetString(L"IDS_MEDIABR_OPT_SLIDESHOW"),
+                                       IDA_CONTEXT_MENU_MORE_SLIDE_SHOW);
+               }
+
+               __pOptionMenu->AddItem(ResourceManager::GetString(L"IDS_IV_OPT_ROTATE_LEFT"),IDA_CONTEXT_MENU_ROTATE_LEFT);
+               __pOptionMenu->AddItem(ResourceManager::GetString(L"IDS_IV_OPT_ROTATE_RIGHT"),IDA_CONTEXT_MENU_ROTATE_RIGHT);
+
+               __pOptionMenu->SetShowState(true);
+               __pOptionMenu->Show();
+
+       }
+}