From 40b3b9cc465cbd716af790b28c4aee40ea9be75d Mon Sep 17 00:00:00 2001 From: Himanshu Date: Thu, 18 Jul 2013 11:35:51 +0530 Subject: [PATCH] Added icons for share via Email and Message Change-Id: Ia899a6ee2309fcbfabfe08457921710c60355348 Signed-off-by: Himanshu --- inc/GlTypes.h | 3 ++ .../T01_1_face_tag_icon_email.png | Bin 0 -> 3373 bytes .../T01_1_face_tag_icon_message.png | Bin 0 -> 3231 bytes src/GlAlbumListEditorForm.cpp | 24 ++++++++++- src/GlFileListEditorForm.cpp | 47 ++++++++++++++------- src/GlTypes.cpp | 2 + 6 files changed, 59 insertions(+), 17 deletions(-) create mode 100644 res/screen-density-xhigh/T01_1_face_tag_icon_email.png create mode 100644 res/screen-density-xhigh/T01_1_face_tag_icon_message.png diff --git a/inc/GlTypes.h b/inc/GlTypes.h index 5ddf8f1..100fdde 100644 --- 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 index 0000000000000000000000000000000000000000..fe2d41f5d1cb5ac58ee5cd9606921df17072880d GIT binary patch literal 3373 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 DuZK3+ literal 0 HcmV?d00001 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 index 0000000000000000000000000000000000000000..44e00580533b751005cbce81371e27a87afbb09a GIT binary patch literal 3231 zcmV;Q3}Ew#P)KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} z0005XNklA>S29Dc%$KH1f<3vQbCEamjav%qCAO~_F2XY_>av%qCpjf)^*e(I) zS03vDcn<|M2Nr+e0o1@YWXi392R)9VW4t=n8v4}E^AVud8m9){VgW65JrNn|2m_D; zMJ%8cC?i8PVQjo8wjC2{5X_K$C&Lm zVYjBFS{Vb$$8fpaINHj%R48TYlmH*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 --- 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 --- 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"; -- 2.7.4