projects / apps / osp / Gallery.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Removed Context Menu, used option menu
[apps/osp/Gallery.git] / src / GlFileListEditorForm.cpp
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);
                }
Domain: Applications / Uncategorized;