Removed Context Menu, used option menu

Change-Id: I3aaadf0b75258ee3ff38caf9ec8f7a3cec01e8eb
Signed-off-by: Himanshu <himanshu.t@samsung.com>

diff --git a/inc/GlAlbumListForm.h b/inc/GlAlbumListForm.h
index b41071b..d922304 100644 (file)
--- a/inc/GlAlbumListForm.h
+++ b/inc/GlAlbumListForm.h
@@ -77,7 +77,6 @@ private:
        result Update(void);
 
 private:
-       bool __isHWBackButtonExist;
        int __itemCount;
        Tizen::Ui::Controls::IconListView* __pAlbumViewIconList;
        Tizen::Ui::Controls::ContextMenu* __pContextMenuMore;

diff --git a/inc/GlFileListEditorForm.h b/inc/GlFileListEditorForm.h
index 6c224ad..a09f66f 100644 (file)
--- a/inc/GlFileListEditorForm.h
+++ b/inc/GlFileListEditorForm.h
@@ -81,10 +81,7 @@ private:
        void SelectAllPressed(void);
 
 private:
-       Tizen::Ui::Controls::ContextMenu* __pContextMenuMore;
        Tizen::Ui::Controls::ContextMenu* __pContextMenuShare;
-       Tizen::Ui::Controls::ContextMenu* __pContextEditorMenuMove;
-       Tizen::Ui::Controls::ContextMenu* __pContextSelectionMenuMove;
        Tizen::Ui::Controls::OptionMenu* __pOptionMenu;
        Tizen::Ui::Controls::Popup* __pDeletePopup;
        Tizen::Graphics::Point __morePosition;
@@ -93,7 +90,6 @@ private:
        SlideShowPopUp* __pPopUp;
        FileMoveTimer* __pFileMove;
        bool __isCopyOperation;
-       bool __isHWBackButtonExist;
        FileListPresentationModel* __pPresentationModel;
 };
 

diff --git a/inc/GlFileListForm.h b/inc/GlFileListForm.h
index 0a9b826..f98f7f8 100644 (file)
--- a/inc/GlFileListForm.h
+++ b/inc/GlFileListForm.h
@@ -63,8 +63,7 @@ private:
        result InitializeFooter(void);
 
 private:
-       bool __isHWBackButtonExist;
-       Tizen::Ui::Controls::ContextMenu* __pContextMenuMore;
+       
        Tizen::Ui::Controls::OptionMenu* __pOptionMenu;
        SlideShowPopUp* __pPopUp;
        FileListPresentationModel* __pPresentationModel;

diff --git a/src/GlAlbumListForm.cpp b/src/GlAlbumListForm.cpp
index dc4c9ec..143a193 100644 (file)
--- a/src/GlAlbumListForm.cpp
+++ b/src/GlAlbumListForm.cpp
@@ -42,10 +42,8 @@ static const int W_FOLDER_SIZE = 348;
 static const int H_FOLDER_SIZE = 348;
 
 AlbumListForm::AlbumListForm(void)
-       : __isHWBackButtonExist(false)
-       , __itemCount(0)
+       : __itemCount(0)
        , __pAlbumViewIconList(null)
-       , __pContextMenuMore(null)
        , __pOptionMenu(null)
        , __pPresentationModel(null)
 
@@ -75,12 +73,6 @@ AlbumListForm::OnInitializing(void)
 {
        AppLogDebug("ENTER");
        result r = E_SUCCESS;
-       GalleryApp* pApp = static_cast<GalleryApp*>(GalleryApp::GetInstance());
-
-        __isHWBackButtonExist = false;
-        __isHWBackButtonExist = pApp->IsHwKeySupported();
-       AppLogDebug("EXIT(%s)", GetErrorMessage(r));
-
 
        __pPresentationModel = AlbumListPresentationModel::GetInstance();
        __pPresentationModel->ClearThumbnailRequests();
@@ -172,6 +164,7 @@ AlbumListForm::InitializeFooter(void)
        {
                pFooter->SetStyle(FOOTER_STYLE_BUTTON_ICON);
                pFooter->SetBackButton();
+               pFooter->SetMenuButton();
                pFooter->RemoveAllItems();
 
                FooterItem itemCamera;
@@ -185,46 +178,16 @@ AlbumListForm::InitializeFooter(void)
                pFooter->AddItem(itemCamera);
                delete pBitmap1;
 
-
-               if( __isHWBackButtonExist == false )
-               {
-                       ButtonItem footerMore;
-                       footerMore.Construct(BUTTON_ITEM_STYLE_ICON, IDA_FOOTER_MORE);
-
-                       Bitmap* pBitmapMore = ResourceManager::GetBitmapN(IDB_CONTROLBAR_MORE);
-                       Bitmap* pBitmapMoreDim = ResourceManager::GetBitmapN(IDB_CONTROLBAR_MORE_DISABLED);
-                       Bitmap* pBitmapMorePressed = ResourceManager::GetBitmapN(IDB_CONTROLBAR_MORE_PRESSED);
-
-                       if (pBitmapMore != null && pBitmapMoreDim != null && pBitmapMorePressed != null)
-                       {
-                               footerMore.SetIcon(BUTTON_ITEM_STATUS_NORMAL, pBitmapMore);
-                               footerMore.SetIcon(BUTTON_ITEM_STATUS_DISABLED, pBitmapMoreDim);
-                               footerMore.SetIcon(BUTTON_ITEM_STATUS_PRESSED, pBitmapMorePressed);
-                       }
-
-                       pFooter->SetButton(BUTTON_POSITION_LEFT, footerMore);
-                       delete pBitmapMore;
-                       delete pBitmapMoreDim;
-                       delete pBitmapMorePressed;
-
-                       __pContextMenuMore = new (std::nothrow) ContextMenu();
-                       __pContextMenuMore->Construct(Point(0, 0), CONTEXT_MENU_STYLE_LIST);
-                       __pContextMenuMore->AddItem(ResourceManager::GetString(L"IDS_COM_HEADER_EDIT"), IDA_FOOTER_EDIT);
-                       __pContextMenuMore->SetShowState(false);
-                       __pContextMenuMore->AddActionEventListener(*this);
-               }
-               else
-               {
-                           __pOptionMenu = new (std::nothrow) OptionMenu();
-                           __pOptionMenu->Construct();
-                           __pOptionMenu->AddItem(ResourceManager::GetString(L"IDS_COM_HEADER_EDIT"),IDA_FOOTER_EDIT);
-                           __pOptionMenu->SetShowState(false);
-                           __pOptionMenu->AddActionEventListener(*this);
-                           SetFormMenuEventListener(this);
-               }
-
+               __pOptionMenu = new (std::nothrow) OptionMenu();
+               __pOptionMenu->Construct();
+               __pOptionMenu->AddItem(ResourceManager::GetString(L"IDS_COM_HEADER_EDIT"),IDA_FOOTER_EDIT);
+               __pOptionMenu->AddItem(ResourceManager::GetString(L"IDS_COM_HEADER_EDIT"), IDA_FOOTER_EDIT);
+               __pOptionMenu->SetShowState(false);
+               __pOptionMenu->AddActionEventListener(*this);
+               SetFormMenuEventListener(this);
                SetFormBackEventListener(this);
        }
+
        pFooter->AddActionEventListener(*this);
        AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
 
@@ -393,22 +356,6 @@ AlbumListForm::OnActionPerformed(const Control& source, int actionId)
        }
        break;
 
-       case IDA_FOOTER_MORE:
-       {
-               if (__pContextMenuMore->GetShowState() == false && __pPresentationModel->GetFolderCount() != 0)
-               {
-                       Rectangle rect = source.GetBounds();
-                       __pContextMenuMore->SetAnchorPosition(Point(rect.width/10, rect.y));
-                       __pContextMenuMore->SetShowState(true);
-                       __pContextMenuMore->Show();
-               }
-               else
-               {
-                       __pContextMenuMore->SetShowState(false);
-               }
-       }
-       break;
-
        default:
                break;
        }
@@ -471,11 +418,11 @@ AlbumListForm::OnSceneActivatedN(const SceneId& previousSceneId, const SceneId&
 
        if ( __itemCount == 0 )
        {
-               GetFooter()->SetButtonEnabled(BUTTON_POSITION_LEFT, false);
+               GetFooter()->SetMenuButtonEnabled(false);
        }
        else
        {
-               GetFooter()->SetButtonEnabled(BUTTON_POSITION_LEFT, true);
+               GetFooter()->SetMenuButtonEnabled(true);
        }
 
        if (__pAlbumViewIconList != null)
@@ -500,11 +447,6 @@ AlbumListForm::OnContentUpdated(void)
 {
        AppLogDebug("ENTER");
 
-       if(__pContextMenuMore != null && __pContextMenuMore ->GetShowState() == true)
-       {
-               __pContextMenuMore->SetShowState(false);
-       }
-
        if ( __pOptionMenu != null && __pOptionMenu ->GetShowState() == true)
        {
                __pOptionMenu->SetShowState(false);
@@ -537,11 +479,11 @@ AlbumListForm::OnContentUpdated(void)
 
        if (__itemCount == 0 )
        {
-               GetFooter()->SetButtonEnabled(BUTTON_POSITION_LEFT, false);
+               GetFooter()->SetMenuButtonEnabled(false);
        }
        else
        {
-               GetFooter()->SetButtonEnabled(BUTTON_POSITION_LEFT, true);
+               GetFooter()->SetMenuButtonEnabled(true);
        }
 
        GetFooter()->Invalidate(true);

diff --git a/src/GlFileListEditorForm.cpp b/src/GlFileListEditorForm.cpp
index 0da3b41..1236ea5 100644 (file)
--- a/src/GlFileListEditorForm.cpp
+++ b/src/GlFileListEditorForm.cpp
@@ -58,10 +58,7 @@ static const unsigned int COLOR_DELETE_BUTTON_TEXT = Color32<248, 246, 239>::Val
 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))
@@ -70,7 +67,6 @@ FileListEditorForm::FileListEditorForm(void)
        , __pPopUp(null)
        , __pFileMove(null)
        , __isCopyOperation(false)
-    , __isHWBackButtonExist(false)
        , __pPresentationModel(null)
 {
        AppLogDebug("ENTER");
@@ -120,10 +116,6 @@ FileListEditorForm::OnInitializing(void)
                AddControl(__pPopUp);
        }
 
-       GalleryApp* pApp = static_cast<GalleryApp*>(GalleryApp::GetInstance());
-        __isHWBackButtonExist = pApp->IsHwKeySupported();
-
-        SetFormMenuEventListener(this);
        __pPresentationModel = FileListPresentationModel::GetInstance();
        __pPresentationModel->ClearThumbnailRequests();
 
@@ -180,31 +172,13 @@ FileListEditorForm::InitializeFooter(void)
                }
                pFooter->SetBackButton();
                SetFormBackEventListener(this);
+
        }
        else
        {
                pFooter->SetStyle(FOOTER_STYLE_BUTTON_ICON_TEXT);
-
-               if (__isHWBackButtonExist == false)
-               {
-                       ButtonItem footerMore;
-                       footerMore.Construct(BUTTON_ITEM_STYLE_ICON, IDA_FOOTER_MORE);
-                       Bitmap* pBitmapMore = ResourceManager::GetBitmapN(IDB_CONTROLBAR_MORE);
-                       Bitmap* pBitmapMoreDim = ResourceManager::GetBitmapN(IDB_CONTROLBAR_MORE_DISABLED);
-                       Bitmap* pBitmapMorePressed = ResourceManager::GetBitmapN(IDB_CONTROLBAR_MORE_PRESSED);
-
-                       if (pBitmapMore != null && pBitmapMoreDim != NULL && pBitmapMorePressed != null)
-                       {
-                               footerMore.SetIcon(BUTTON_ITEM_STATUS_NORMAL, pBitmapMore);
-                               footerMore.SetIcon(BUTTON_ITEM_STATUS_DISABLED, pBitmapMoreDim);
-                               footerMore.SetIcon(BUTTON_ITEM_STATUS_PRESSED, pBitmapMorePressed);
-                       }
-                       pFooter->SetButton(BUTTON_POSITION_LEFT,footerMore);
-
-                       delete pBitmapMore;
-                       delete pBitmapMoreDim;
-                       delete pBitmapMorePressed;
-               }
+               pFooter->SetMenuButton();
+               SetFormMenuEventListener(this);
 
                FooterItem footerShare;
                r = footerShare.Construct(IDA_FOOTER_SHARE);
@@ -265,71 +239,31 @@ FileListEditorForm::InitializeFooter(void)
 
                AppLogDebug("GetItemCheckedCount(%d)", checkedCount);
 
-               if (__isHWBackButtonExist == false)
+               if (__pOptionMenu != null)
                {
-                       if (__pContextMenuMore != null)
-                       {
-                               delete __pContextMenuMore;
-                               __pContextMenuMore = null;
-                       }
-
-                       __pContextMenuMore = new (std::nothrow) ContextMenu();
-                       __pContextMenuMore->Construct(Point(0, 0), CONTEXT_MENU_STYLE_LIST);
-
-                       __pContextMenuMore->AddItem(ResourceManager::GetString(L"IDS_COM_BODY_MOVE"),
-                                       IDA_CONTEXT_MENU_MORE_MOVE);
-                       __pContextMenuMore->AddItem(ResourceManager::GetString(L"IDS_COM_BODY_COPY"),
-                                       IDA_CONTEXT_MENU_MORE_COPY);
-
-                       if (checkedCount > 1)
-                       {
-                               __pContextMenuMore->AddItem(ResourceManager::GetString(L"IDS_MEDIABR_OPT_SLIDESHOW"),
-                                               IDA_CONTEXT_MENU_MORE_SLIDE_SHOW);
-                       }
-
-                       __pContextMenuMore->AddItem(ResourceManager::GetString(L"IDS_IV_OPT_ROTATE_LEFT"),IDA_CONTEXT_MENU_ROTATE_LEFT);
-                       __pContextMenuMore->AddItem(ResourceManager::GetString(L"IDS_IV_OPT_ROTATE_RIGHT"),IDA_CONTEXT_MENU_ROTATE_RIGHT);
-
-                       __pContextMenuMore->SetShowState(false);
-                       __pContextMenuMore->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);
-
+                       delete __pOptionMenu;
+                       __pOptionMenu = null;
                }
-               else
-               {
 
-                       if (__pOptionMenu != null)
-                       {
-                               delete __pOptionMenu;
-                               __pOptionMenu = null;
-                       }
+               __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);
 
-                       __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)
+               {
+                       __pOptionMenu->AddItem(ResourceManager::GetString(L"IDS_MEDIABR_OPT_SLIDESHOW"),
+                                       IDA_CONTEXT_MENU_MORE_SLIDE_SHOW);
+               }
 
-                       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->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->AddActionEventListener(*this);
 
-                       __pOptionMenu->AddActionEventListener(*this);
 
-               }
 
                __pContextMenuShare = new (std::nothrow) ContextMenu();
                __pContextMenuShare->Construct(Point(0, 0), CONTEXT_MENU_STYLE_LIST);
@@ -384,11 +318,12 @@ 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)
@@ -398,20 +333,6 @@ 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;
@@ -436,32 +357,6 @@ FileListEditorForm::OnActionPerformed(const Control& source, int actionId)
                SelectAllPressed();
        break;
 
-       case IDA_FOOTER_MORE:
-       {
-               InitializeFooter();
-
-               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 IDA_FOOTER_SHARE:
        {
                if (__pContextMenuShare->GetShowState() == false)
@@ -553,43 +448,12 @@ FileListEditorForm::OnActionPerformed(const Control& source, int actionId)
                {
                        __isCopyOperation = true;
                }
+
                RefreshFolderList();
 
-               if ( __isHWBackButtonExist == false )
-               {
+               __pOptionMenu->SetShowState(true);
+               __pOptionMenu->Show();
 
-                       if (pSceneManager->GetCurrentSceneId() == IDSCN_ALL_LIST_EDITOR)
-                       {
-                               if (__pContextEditorMenuMove->GetShowState() == false)
-                               {
-                                       __pContextEditorMenuMove->SetAnchorPosition(Point(__morePosition.x, __morePosition.y - 48));
-                                       __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);
-                               }
-                       }
-               }
-               else
-               {
-                       __pOptionMenu->SetShowState(true);
-                       __pOptionMenu->Show();
-               }
 
        }
        break;
@@ -1087,38 +951,12 @@ FileListEditorForm::RefreshFolderList(void)
                }
        }
 
-       if (__isHWBackButtonExist == false)
-       {
-               __pContextEditorMenuMove->RemoveAllItems();
-               __pContextEditorMenuMove->AddItem(ResourceManager::GetString(L"IDS_MEDIABR_OPT_CREATE_ALBUM"),
-                               IDA_CONTEXTMENU_EDITOR_MOVE_CREATE_ALBUM);
-               __pContextSelectionMenuMove->RemoveAllItems();
-               __pContextSelectionMenuMove->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())
-                       {
-                               __pContextEditorMenuMove->AddItem(*(new (std::nothrow) String(*pDirName)),
-                                               IDA_CONTEXTMENU_EDITOR_MOVE_ALBUM_ARRAY_START + i);
-                               __pContextSelectionMenuMove->AddItem(*(new (std::nothrow) String(*pDirName)),
-                                               IDA_CONTEXTMENU_SELECTION_MOVE_ALBUM_ARRAY_START + i);
-                       }
-               }
-               __pContextEditorMenuMove->SetShowState(false);
-               __pContextSelectionMenuMove->SetShowState(false);
-       }
-       else
-       {
                __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));
@@ -1130,7 +968,7 @@ FileListEditorForm::RefreshFolderList(void)
                        }
                }
 
-       }
+
        AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
 }
 
@@ -1215,13 +1053,13 @@ FileListEditorForm::SetFooterButtonsState(const bool enableState)
        {
                if (enableState == true)
                {
-                       pFooter->SetButtonEnabled(BUTTON_POSITION_LEFT, true);
+                       pFooter->SetMenuButtonEnabled(true);
                        pFooter->SetItemEnabled(0, true);
                        pFooter->SetItemEnabled(1, true);
                }
                else
                {
-                       pFooter->SetButtonEnabled(BUTTON_POSITION_LEFT, false);
+                       pFooter->SetMenuButtonEnabled(false);
                        pFooter->SetItemEnabled(0, false);
                        pFooter->SetItemEnabled(1, false);
                }

diff --git a/src/GlFileListForm.cpp b/src/GlFileListForm.cpp
index 1668f49..0e96fae 100644 (file)
--- a/src/GlFileListForm.cpp
+++ b/src/GlFileListForm.cpp
@@ -39,9 +39,7 @@ using namespace Tizen::Ui::Scenes;
 using namespace Tizen::Content;
 
 FileListForm::FileListForm(void)
-       : __isHWBackButtonExist(false)
-       , __pContextMenuMore(null)
-       , __pOptionMenu(null)
+       : __pOptionMenu(null)
        , __pPopUp(null)
        , __pPresentationModel(null)
 {
@@ -71,12 +69,7 @@ FileListForm::OnInitializing(void)
        Header* pHeader = GetHeader();
        TryReturn(pHeader != null, E_FAILURE, "[%s] fail to get the Header.", GetErrorMessage(GetLastResult()));
 
-        __isHWBackButtonExist = false;
-
           SetFormMenuEventListener(this);
-          GalleryApp* pApp = static_cast<GalleryApp*>(GalleryApp::GetInstance());
-
-          __isHWBackButtonExist = pApp->IsHwKeySupported();
 
        __pPresentationModel = FileListPresentationModel::GetInstance();
        __pPresentationModel->ClearThumbnailRequests();
@@ -102,12 +95,6 @@ FileListForm::OnTerminating(void)
 {
        AppLogDebug("ENTER");
 
-       if (__pContextMenuMore != null)
-       {
-               delete __pContextMenuMore;
-               __pContextMenuMore = null;
-       }
-
        if ( __pOptionMenu != null )
        {
                delete __pOptionMenu;
@@ -137,26 +124,6 @@ FileListForm::OnActionPerformed(const Control& source, int actionId)
 
        switch (actionId)
        {
-       case IDA_FOOTER_MORE:
-       {
-               AppLogDebug("ITEMCOUNT(%d)", __pPresentationModel->GetCurrentAlbumContentInfoCount());
-
-               InitializeFooter();
-
-               if (__pContextMenuMore->GetShowState() == false)
-               {
-                       Rectangle rect = source.GetBounds();
-                       __pContextMenuMore->SetAnchorPosition(Point(rect.width / 10, rect.y));
-                       __pContextMenuMore->SetShowState(true);
-                       __pContextMenuMore->Show();
-               }
-               else
-               {
-                       __pContextMenuMore->SetShowState(false);
-               }
-       }
-       break;
-
        case IDA_FOOTER_EDIT:
        {
                if (pSceneManager->GetCurrentSceneId() == IDSCN_ALL_LIST)
@@ -226,28 +193,8 @@ FileListForm::InitializeFooter(void)
 
        pFooter->RemoveAllItems();
        pFooter->SetStyle(FOOTER_STYLE_BUTTON_ICON);
-
-
-       if ( __isHWBackButtonExist == false )
-       {
-               ButtonItem footerMore;
-               footerMore.Construct(BUTTON_ITEM_STYLE_ICON, IDA_FOOTER_MORE);
-               Bitmap* pBitmapMore = ResourceManager::GetBitmapN(IDB_CONTROLBAR_MORE);
-               Bitmap* pBitmapMoreDim = ResourceManager::GetBitmapN(IDB_CONTROLBAR_MORE_DISABLED);
-               Bitmap* pBitmapMorePressed = ResourceManager::GetBitmapN(IDB_CONTROLBAR_MORE_PRESSED);
-
-               if (pBitmapMore != null && pBitmapMoreDim != null && pBitmapMorePressed != null)
-               {
-                       footerMore.SetIcon(BUTTON_ITEM_STATUS_NORMAL, pBitmapMore);
-                       footerMore.SetIcon(BUTTON_ITEM_STATUS_DISABLED, pBitmapMoreDim);
-                       footerMore.SetIcon(BUTTON_ITEM_STATUS_PRESSED, pBitmapMorePressed);
-               }
-               pFooter->SetButton(BUTTON_POSITION_LEFT, footerMore);
-
-               delete pBitmapMore;
-               delete pBitmapMoreDim;
-               delete pBitmapMorePressed;
-       }
+       pFooter->SetMenuButton();
+       pFooter->SetBackButton();
 
        FooterItem itemCamera;
        itemCamera.Construct(IDA_FOOTER_CAMERA);
@@ -258,62 +205,30 @@ FileListForm::InitializeFooter(void)
        }
        pFooter->AddItem(itemCamera);
 
-       if ( __isHWBackButtonExist == false )
-       {
 
-               if (__pContextMenuMore != null)
-               {
-                       delete __pContextMenuMore;
-                       __pContextMenuMore = null;
-               }
+       if (__pOptionMenu != null)
+       {
+               delete __pOptionMenu;
+               __pOptionMenu = null;
+       }
 
-               __pContextMenuMore = new (std::nothrow) ContextMenu();
-               __pContextMenuMore->Construct(Point(0, 0), CONTEXT_MENU_STYLE_LIST);
+       __pOptionMenu = new (std::nothrow) OptionMenu();
+       __pOptionMenu->Construct();
 
-               if (__pPresentationModel->GetCurrentAlbumContentInfoCount() > 1)
-               {
-                       __pContextMenuMore->AddItem(ResourceManager::GetString(L"IDS_MEDIABR_OPT_SLIDESHOW"), IDA_FOOTER_SLIDESHOW);
-               }
+       if (__pPresentationModel->GetCurrentAlbumContentInfoCount() > 1)
+       {
+               __pOptionMenu->AddItem(ResourceManager::GetString(L"IDS_MEDIABR_OPT_SLIDESHOW"), IDA_FOOTER_SLIDESHOW);
+       }
 
-               if (__pPresentationModel->GetCurrentAlbumContentInfoCount() == 0)
-               {
-                       __pContextMenuMore->SetEnabled(false);
-               }
-               else
-               {
-                       __pContextMenuMore->AddItem(ResourceManager::GetString(L"IDS_COM_HEADER_EDIT"), IDA_FOOTER_EDIT);
-                       __pContextMenuMore->SetShowState(false);
-                       __pContextMenuMore->AddActionEventListener(*this);
-               }
+       if (__pPresentationModel->GetCurrentAlbumContentInfoCount() == 0)
+       {
+               __pOptionMenu->SetEnabled(false);
        }
        else
        {
-               if (__pOptionMenu != null)
-               {
-                       delete __pOptionMenu;
-                       __pOptionMenu = null;
-               }
-
-               __pOptionMenu = new (std::nothrow) OptionMenu();
-               __pOptionMenu->Construct();
-
-               if (__pPresentationModel->GetCurrentAlbumContentInfoCount() > 1)
-               {
-                       __pOptionMenu->AddItem(ResourceManager::GetString(L"IDS_MEDIABR_OPT_SLIDESHOW"), IDA_FOOTER_SLIDESHOW);
-               }
-
-               if (__pPresentationModel->GetCurrentAlbumContentInfoCount() == 0)
-               {
-                       __pOptionMenu->SetEnabled(false);
-               }
-               else
-               {
-                       __pOptionMenu->AddItem(ResourceManager::GetString(L"IDS_COM_HEADER_EDIT"), IDA_FOOTER_EDIT);
-                       __pOptionMenu->AddActionEventListener(*this);
-               }
-
+               __pOptionMenu->AddItem(ResourceManager::GetString(L"IDS_COM_HEADER_EDIT"), IDA_FOOTER_EDIT);
+               __pOptionMenu->AddActionEventListener(*this);
        }
-       pFooter->SetBackButton();
 
        pFooter->AddActionEventListener(*this);
        AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
@@ -381,7 +296,7 @@ FileListForm::OnSlideSettingPopUpItemSelected(int index)
 void
 FileListForm::SetFooterState(bool state)
 {
-       GetFooter()->SetButtonEnabled(BUTTON_POSITION_LEFT,state);
+       GetFooter()->SetMenuButtonEnabled(state);
        GetFooter()->Invalidate(true);
 }
 
@@ -396,7 +311,7 @@ FileListForm::OnFormMenuRequested (Tizen::Ui::Controls::Form &source)
                return ;
        }
 
-       __pOptionMenu->Show();
        __pOptionMenu->SetShowState(true);
+       __pOptionMenu->Show();
 
 }