Removed Context Menu, used option menu

[apps/osp/Gallery.git] / src / GlFileListForm.cpp

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();
 
 }