Removed Context Menu, used option menu

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

diff --git a/src/GlAlbumListForm.cpp b/src/GlAlbumListForm.cpp
index f2551ca..143a193 100644 (file)
--- a/src/GlAlbumListForm.cpp
+++ b/src/GlAlbumListForm.cpp
@@ -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
 //
@@ -19,7 +19,6 @@
  * @brief              This is the implementation file for AlbumListForm class.
  */
 
-#include <FApp.h>
 #include "GlAlbumInfo.h"
 #include "GlAlbumListForm.h"
 #include "GlAlbumListPresentationModel.h"
@@ -43,10 +42,11 @@ static const int W_FOLDER_SIZE = 348;
 static const int H_FOLDER_SIZE = 348;
 
 AlbumListForm::AlbumListForm(void)
-       : __pAlbumViewIconList(null)
-       , __pContextMenuMore(null)
-       , __itemCount(0)
+       : __itemCount(0)
+       , __pAlbumViewIconList(null)
+       , __pOptionMenu(null)
        , __pPresentationModel(null)
+
 {
        AppLogDebug("ENTER");
        AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
@@ -127,7 +127,6 @@ AlbumListForm::InitializeHeader(void)
        if (pHeader == null)
        {
                AppLogDebug("EXIT 1(%s)", GetErrorMessage(GetLastResult()));
-
                return E_SYSTEM;
        }
 
@@ -135,7 +134,6 @@ AlbumListForm::InitializeHeader(void)
        if (r != E_SUCCESS)
        {
                AppLogDebug("EXIT 2(%s)", GetErrorMessage(GetLastResult()));
-
                return r;
        }
 
@@ -154,7 +152,6 @@ AlbumListForm::InitializeFooter(void)
        if (pFooter == null)
        {
                AppLogDebug("EXIT 1");
-
                return E_SYSTEM;
        }
 
@@ -167,6 +164,7 @@ AlbumListForm::InitializeFooter(void)
        {
                pFooter->SetStyle(FOOTER_STYLE_BUTTON_ICON);
                pFooter->SetBackButton();
+               pFooter->SetMenuButton();
                pFooter->RemoveAllItems();
 
                FooterItem itemCamera;
@@ -180,24 +178,16 @@ AlbumListForm::InitializeFooter(void)
                pFooter->AddItem(itemCamera);
                delete pBitmap1;
 
-               ButtonItem footerMore;
-               footerMore.Construct(BUTTON_ITEM_STYLE_ICON, IDA_FOOTER_MORE);
-               Bitmap* pBitmapMore = ResourceManager::GetBitmapN(IDB_CONTROLBAR_MORE);
-               if (pBitmapMore != null)
-               {
-                       footerMore.SetIcon(BUTTON_ITEM_STATUS_NORMAL, pBitmapMore);
-               }
-               pFooter->SetButton(BUTTON_POSITION_LEFT,footerMore);
-               delete pBitmapMore;
-
-               __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);
-
+               __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()));
 
@@ -210,7 +200,7 @@ AlbumListForm::CreateIconListView(void)
        AppLogDebug("ENTER");
        Dimension itemSize(W_FOLDER_SIZE, H_FOLDER_SIZE);
 
-       __pAlbumViewIconList = static_cast< IconListView* >(GetControl(L"IDC_ICONLISTVIEW_ALBUM_LIST"));
+       __pAlbumViewIconList = static_cast<IconListView*>(GetControl(L"IDC_ICONLISTVIEW_ALBUM_LIST"));
        AppAssert(__pAlbumViewIconList);
 
        __pAlbumViewIconList->SetItemProvider(*this);
@@ -329,7 +319,7 @@ AlbumListForm::OnTerminating(void)
 {
        AppLogDebug("ENTER");
        __pPresentationModel->RemovePresentationModelListener(*this);
-
+       __pPresentationModel->RemoveContentEventListener(*this);
        if (__pContextMenuMore != null)
        {
                delete __pContextMenuMore;
@@ -349,40 +339,24 @@ AlbumListForm::OnActionPerformed(const Control& source, int actionId)
        switch (actionId)
        {
        case IDA_FOOTER_CAMERA:
-               {
-                       HashMap* pDataList = new (std::nothrow) HashMap(SingleObjectDeleter);
-                       pDataList->Construct();
-                       pDataList->Add(new (std::nothrow) String(APPCONTROL_KEY_CAMERA_ALLOW_SWITCH),
-                                       new (std::nothrow) String(APPCONTROL_DATA_TRUE));
-
-                       __pPresentationModel->StartAppControl(APPCONTROL_PROVIDER_ID_CAMERA,
-                                       APPCONTROL_OPERATION_ID_CREATE_CONTENT, null,
-                                       new (std::nothrow) String(APPCONTROL_MIME_IMAGE_JPG), pDataList, null);
-               }
-               break;
+       {
+               HashMap* pDataList = new (std::nothrow) HashMap(SingleObjectDeleter);
+               pDataList->Construct();
+               pDataList->Add(new (std::nothrow) String(APPCONTROL_KEY_CAMERA_ALLOW_SWITCH),
+                               new (std::nothrow) String(APPCONTROL_DATA_TRUE));
+               __pPresentationModel->StartAppControl(APPCONTROL_PROVIDER_ID_CAMERA,
+                               APPCONTROL_OPERATION_ID_CREATE_CONTENT, null,
+                               new (std::nothrow) String(APPCONTROL_MIME_IMAGE_JPG), pDataList, null);
+       }
+       break;
+
        case IDA_FOOTER_EDIT:
-               {
-                       pSceneManager->GoForward(ForwardSceneTransition(IDSCN_ALBUM_LIST_EDITOR));
-               }
-               break;
-       case IDA_FOOTER_MORE:
-               {
-                       if (__pContextMenuMore->GetShowState() == false && __pPresentationModel->GetFolderCount() != 0)
-                       {
-                               Rectangle rect = source.GetBounds();
-                               __pContextMenuMore->SetAnchorPosition(Point(rect.width/8, rect.y));
-                               __pContextMenuMore->SetShowState(true);
-                               __pContextMenuMore->Show();
-                       }
-                       else
-                       {
-                               __pContextMenuMore->SetShowState(false);
-                       }
-               }
-               break;
+       {
+               pSceneManager->GoForward(ForwardSceneTransition(IDSCN_ALBUM_LIST_EDITOR));
+       }
+       break;
+
        default:
-               {
-               }
                break;
        }
        AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
@@ -424,6 +398,7 @@ AlbumListForm::OnSceneActivatedN(const SceneId& previousSceneId, const SceneId&
        {
                if (__pPresentationModel->GetAppControlMediaType() == APPCONTROL_MEDIA_TYPE_IMAGE)
                {
+                       __pPresentationModel->ClearThumbnailRequests(false);
                        __pPresentationModel->InitializeAlbumInfoList(CONTENT_TYPE_IMAGE);
                }
                else if (__pPresentationModel->GetAppControlMediaType() == APPCONTROL_MEDIA_TYPE_VIDEO)
@@ -441,6 +416,15 @@ AlbumListForm::OnSceneActivatedN(const SceneId& previousSceneId, const SceneId&
        }
        __itemCount = __pPresentationModel->GetFolderCount();
 
+       if ( __itemCount == 0 )
+       {
+               GetFooter()->SetMenuButtonEnabled(false);
+       }
+       else
+       {
+               GetFooter()->SetMenuButtonEnabled(true);
+       }
+
        if (__pAlbumViewIconList != null)
        {
                __pAlbumViewIconList->UpdateList();
@@ -459,14 +443,21 @@ AlbumListForm::OnSceneDeactivated(const SceneId& currentSceneId, const SceneId&
 }
 
 void
-AlbumListForm::OnContentUpdated()
+AlbumListForm::OnContentUpdated(void)
 {
        AppLogDebug("ENTER");
 
+       if ( __pOptionMenu != null && __pOptionMenu ->GetShowState() == true)
+       {
+               __pOptionMenu->SetShowState(false);
+               __pOptionMenu->Show();
+       }
+
        if (__pPresentationModel->GetAppControlMode() == APPCONTROL_MODE_PICK)
        {
                if (__pPresentationModel->GetAppControlMediaType() == APPCONTROL_MEDIA_TYPE_IMAGE)
                {
+                       __pPresentationModel->ClearThumbnailRequests(false);
                        __pPresentationModel->InitializeAlbumInfoList(CONTENT_TYPE_IMAGE);
                }
                else if (__pPresentationModel->GetAppControlMediaType() == APPCONTROL_MEDIA_TYPE_VIDEO)
@@ -485,6 +476,17 @@ AlbumListForm::OnContentUpdated()
 
        __itemCount = __pPresentationModel->GetFolderCount();
        __pAlbumViewIconList->UpdateList();
+
+       if (__itemCount == 0 )
+       {
+               GetFooter()->SetMenuButtonEnabled(false);
+       }
+       else
+       {
+               GetFooter()->SetMenuButtonEnabled(true);
+       }
+
+       GetFooter()->Invalidate(true);
        AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
 }
 
@@ -513,3 +515,17 @@ AlbumListForm::Update(void)
 
        return r;
 }
+
+void
+AlbumListForm::OnFormMenuRequested (Tizen::Ui::Controls::Form &source)
+{
+
+       if ( __pOptionMenu == null )
+       {
+               return ;
+       }
+
+       __pOptionMenu->SetShowState(true);
+       __pOptionMenu->Show();
+
+}