Added icons for share via Email and Message

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

diff --git a/inc/GlTypes.h b/inc/GlTypes.h
index 5ddf8f1..100fdde 100644 (file)
--- a/inc/GlTypes.h
+++ b/inc/GlTypes.h
@@ -325,6 +325,9 @@ extern const wchar_t* IDB_ALBUM_RENAME_PROGRESS28;
 extern const wchar_t* IDB_ALBUM_RENAME_PROGRESS29;
 extern const wchar_t* IDB_ALBUM_RENAME_PROGRESS30;
 
+extern const wchar_t* IDB_IMAGE_CONTEXT_EMAIL_ICON;
+extern const wchar_t* IDB_IMAGE_CONTEXT_MESSAGE_ICON;
+
 static const unsigned int CUSTOM_COLOR_GREY = Tizen::Graphics::Color32<124,124,124>::Value;
 static const unsigned int CUSTOM_COLOR_TRANSPARENT = Tizen::Graphics::Color32<0,0,0>::Value;
 static const unsigned int CUSTOM_BACKGROUND_COLOR_LISTVIEW = Tizen::Graphics::Color32<236,240,242>::Value;

diff --git a/res/screen-density-xhigh/T01_1_face_tag_icon_email.png b/res/screen-density-xhigh/T01_1_face_tag_icon_email.png
new file mode 100644 (file)
index 0000000..fe2d41f
Binary files /dev/null and b/res/screen-density-xhigh/T01_1_face_tag_icon_email.png differ

diff --git a/res/screen-density-xhigh/T01_1_face_tag_icon_message.png b/res/screen-density-xhigh/T01_1_face_tag_icon_message.png
new file mode 100644 (file)
index 0000000..44e0058
Binary files /dev/null and b/res/screen-density-xhigh/T01_1_face_tag_icon_message.png differ

diff --git a/src/GlAlbumListEditorForm.cpp b/src/GlAlbumListEditorForm.cpp
index 55530cd..4bb4218 100644 (file)
--- a/src/GlAlbumListEditorForm.cpp
+++ b/src/GlAlbumListEditorForm.cpp
@@ -610,12 +610,32 @@ AlbumListEditorForm::OnActionPerformed(const Control& source, int actionId)
                        __pShareContextMenu = null;
                }
 
+
+               Bitmap* pBitmapEmailContextItem = null;
+               Bitmap* pBitmapMessageContextItem = null;
+               pBitmapEmailContextItem = ResourceManager::GetBitmapN(IDB_IMAGE_CONTEXT_EMAIL_ICON);
+               pBitmapMessageContextItem = ResourceManager::GetBitmapN(IDB_IMAGE_CONTEXT_MESSAGE_ICON);
+
                __pShareContextMenu = new (std::nothrow) ContextMenu();
                __pShareContextMenu->Construct(Point(GetClientAreaBounds().width/3 + 15, GetClientAreaBounds().height + __pSelectCountLabel->GetHeight() + 5),
                                CONTEXT_MENU_STYLE_LIST, CONTEXT_MENU_ANCHOR_DIRECTION_UPWARD);
+
+               if ( pBitmapMessageContextItem != null)
+               {
                 __pShareContextMenu->AddItem(ResourceManager::GetString(L"IDS_COM_BODY_MESSAGE"),
-                               IDA_CONTEXT_MENU_MESSAGE);
-               __pShareContextMenu->AddItem(ResourceManager::GetString(L"IDS_COM_BODY_EMAIL"), IDA_CONTEXT_MENU_EMAIL);
+                               IDA_CONTEXT_MENU_MESSAGE , *pBitmapMessageContextItem, null, null);
+
+                        delete pBitmapMessageContextItem;
+               }
+
+               if ( pBitmapEmailContextItem != null)
+               {
+                       __pShareContextMenu->AddItem(ResourceManager::GetString(L"IDS_COM_BODY_EMAIL"), IDA_CONTEXT_MENU_EMAIL,
+                                       *pBitmapEmailContextItem, null, null);
+
+                        delete pBitmapEmailContextItem;
+               }
+
                __pShareContextMenu->SetFocusable(true);
                __pShareContextMenu->AddActionEventListener(*this);
                __pShareContextMenu->SetShowState(true);

diff --git a/src/GlFileListEditorForm.cpp b/src/GlFileListEditorForm.cpp
index db81583..0bdac54 100644 (file)
--- a/src/GlFileListEditorForm.cpp
+++ b/src/GlFileListEditorForm.cpp
@@ -368,28 +368,45 @@ FileListEditorForm::OnActionPerformed(const Control& source, int actionId)
                        __pShareContextMenu = null;
                }
 
+               Bitmap* pBitmapEmailContextItem = null;
+               Bitmap* pBitmapMessageContextItem = null;
+               pBitmapEmailContextItem = ResourceManager::GetBitmapN(IDB_IMAGE_CONTEXT_EMAIL_ICON);
+               pBitmapMessageContextItem = ResourceManager::GetBitmapN(IDB_IMAGE_CONTEXT_MESSAGE_ICON);
+
                __pShareContextMenu = new (std::nothrow) ContextMenu();
                __pShareContextMenu->Construct(Point(GetClientAreaBounds().width/3 + 15, GetClientAreaBounds().height),
                                CONTEXT_MENU_STYLE_LIST, CONTEXT_MENU_ANCHOR_DIRECTION_UPWARD);
-               __pShareContextMenu->AddItem(ResourceManager::GetString(L"IDS_COM_BODY_MESSAGE"),
-                               IDA_CONTEXT_MENU_SHARE_MESSAGE);
-               __pShareContextMenu->AddItem(ResourceManager::GetString(L"IDS_COM_BODY_EMAIL"),
-                               IDA_CONTEXT_MENU_SHARE_EMAIL);
+
+               if ( pBitmapMessageContextItem != null)
+               {
+                       __pShareContextMenu->AddItem(ResourceManager::GetString(L"IDS_COM_BODY_MESSAGE"),
+                               IDA_CONTEXT_MENU_SHARE_MESSAGE, *pBitmapMessageContextItem, null, null);
+                       delete pBitmapMessageContextItem;
+               }
+
+               if ( pBitmapEmailContextItem != null)
+               {
+                       __pShareContextMenu->AddItem(ResourceManager::GetString(L"IDS_COM_BODY_EMAIL"),
+                               IDA_CONTEXT_MENU_SHARE_EMAIL, *pBitmapEmailContextItem, null, null);
+                       delete pBitmapEmailContextItem;
+               }
                __pShareContextMenu->SetFocusable(true);
                __pShareContextMenu->AddActionEventListener(*this);
 
-                       Rectangle rect = source.GetBounds();
-                       if (pSceneManager->GetCurrentSceneId() == IDSCN_ALL_LIST_SELECTION)
-                       {
-                               __pShareContextMenu->SetAnchorPosition(Point(rect.width / 8 * 3, rect.y));
-                       }
-                       else
-                       {
-                               __pShareContextMenu->SetAnchorPosition(Point(rect.width / 8 * 3, rect.y - H_TOAST_LABEL));
-                       }
 
-                       __pShareContextMenu->SetShowState(true);
-                       __pShareContextMenu->Show();
+               Rectangle rect = source.GetBounds();
+
+               if (pSceneManager->GetCurrentSceneId() == IDSCN_ALL_LIST_SELECTION)
+               {
+                       __pShareContextMenu->SetAnchorPosition(Point(rect.width / 8 * 3, rect.y));
+               }
+               else
+               {
+                       __pShareContextMenu->SetAnchorPosition(Point(rect.width / 8 * 3, rect.y - H_TOAST_LABEL));
+               }
+
+               __pShareContextMenu->SetShowState(true);
+               __pShareContextMenu->Show();
 
        }
        break;

diff --git a/src/GlTypes.cpp b/src/GlTypes.cpp
index 9dc5a6a..774089a 100644 (file)
--- a/src/GlTypes.cpp
+++ b/src/GlTypes.cpp
@@ -204,3 +204,5 @@ const wchar_t* IDB_ALBUM_RENAME_PROGRESS28 = L"00_list_process_28.png";
 const wchar_t* IDB_ALBUM_RENAME_PROGRESS29 = L"00_list_process_29.png";
 const wchar_t* IDB_ALBUM_RENAME_PROGRESS30 = L"00_list_process_30.png";
 
+const wchar_t* IDB_IMAGE_CONTEXT_EMAIL_ICON = L"T01_1_face_tag_icon_email.png";
+const wchar_t* IDB_IMAGE_CONTEXT_MESSAGE_ICON =  L"T01_1_face_tag_icon_message.png";