From 05dc0839c29eccfffcfbc0b032598609b2945d5e Mon Sep 17 00:00:00 2001 From: Soohye Shin Date: Thu, 25 Jun 2015 15:00:46 +0900 Subject: [PATCH] add elements in view_user_edit - photo - entry input - switch icon - delete icon Change-Id: I3c0095a07b646a3423bc37e3990bc1f3f0518cf8 Signed-off-by: Soohye Shin --- edje/images/btn_switch_off_nor.png | Bin 0 -> 1112 bytes edje/images/btn_switch_on_nor.png | Bin 0 -> 1565 bytes edje/view/useredit.edc | 231 ++++++++++++++++++++++++++++-- images/ic_user_profile_current_01_foc.png | Bin 0 -> 5765 bytes images/ic_user_profile_current_01_nor.png | Bin 0 -> 6116 bytes include/defs.h | 9 ++ src/utils.c | 14 +- 7 files changed, 235 insertions(+), 19 deletions(-) create mode 100644 edje/images/btn_switch_off_nor.png create mode 100644 edje/images/btn_switch_on_nor.png create mode 100644 images/ic_user_profile_current_01_foc.png create mode 100644 images/ic_user_profile_current_01_nor.png diff --git a/edje/images/btn_switch_off_nor.png b/edje/images/btn_switch_off_nor.png new file mode 100644 index 0000000000000000000000000000000000000000..10d632c9fb9bee0518941f30a5d69b5dcbb0a95c GIT binary patch literal 1112 zcmbVLO-$2J9Iv3FC=w5vNQi05L5Z&I+q$kROzhT9rVelnA)YMlV{4#&rG0aS#DgX# z8a#XQ$k7-NCgMi|CYng1CSE+?0izdVh9g{!&;DaAySkj~k92^OGk&dsjEeu`?H zvWgRUB7a^skj?5Lh7D|&uqmp4AaHeK8e)19mMka5e1E#k(3Y8E#^ZTD?`B}x8l3mw z==@O8n4dP1CNpq~?hj<5z=l|-1AE5t^vYx%9&-#`gW%~DQ+H}2KSF1a2kAH) zix@lrv?#Jbh>IdPNk@4Q<#;m02oU7BC`S`?<70?5&zzDAYPMmE>{3h_V^`+5YPHH% zV=VGY97raUp^j)YLJ$#u&cS*Rar~a91{L~-XSvuy4jpRLCs75b7~*L?1l!H$Hx)a6 zBT*z}T%fxgV0q5A!?S>Zm?zT4+0*N>BuxF7+ z(Pva-RBY(roSI_D4QpDaEb-}BGLZy=#A{j{03|786&1u{iYls#mTl_Tikp$7s4DOx z5Yh?&T3i8IM$2kZNstl=KAmWCbB>R7$AC?{7O~sl#<%6l84v0hc}0X~niVioMi}{J zg;_spad@#zPx&!S?@b|uTnY6GF?MsW8&KjyV?%iUAflU zl-(`v@{NUKZcE#NZmBNA%Wmn-+OG#cuFjS|?+hizWP>wf^l+gzOh literal 0 HcmV?d00001 diff --git a/edje/images/btn_switch_on_nor.png b/edje/images/btn_switch_on_nor.png new file mode 100644 index 0000000000000000000000000000000000000000..745dbde8bba401070931bdfb25904f511f72ae9e GIT binary patch literal 1565 zcmeAS@N?(olHy`uVBq!ia0vp^89;2t!2~3i{PHdYQj#UE5hcO-X(i=}MX3yqDfvmM z3ZA)%>8U}fi7AzZCsS=07?{&CLn2Bde0{8v^Kf6`()~Xj@TAnpKdC8`Lf!&sHg;q@=(~U%$M( zT(8_%FTW^V-_X+15@d#vkuFe$ZgFK^Nn(X=Ua>OF1ees}t-3#_`hBq$Z(46Le)Ln;eW^@CE2 z^Gl18f$@>14ATq@JNy=b6armi*iJ_sRqmhM^lZC6ZsfC%dxrH0d3~YLhOkIs#ot+&GO`MDj4P8wwP0Y+( zfowNt3l~#oXH%G7&%EN2#JuEGn7x@md!c$Q@#?j5E=o--$uA1Y&(DFSfPjqrlKkR~ z`~n5%U^4}c@XWlF{PJQ=Q1n22>ylcOS(cjOR+OKs01jWPOf2@BTbh}hIGQ;c0A1i} zYG`O-ZsF)?YGLYTY;I`jV(6>{)tf?2nCSx@qYp|PNQng|1WbV-COqi_Iq=Mrng`4= zMZm0a+UDsT1_mZyPZ!6Kid%1H$9qR5${e>|yOMcfMUQhKcDmbr|p6dRzKEuUhy{;HF4|ywn^^A{`UC1lz-OgGWnrSg(B`C)bdE94}>_5 z2Fd`@PKy&JT6*o3ISw^fQ%mj49_GG!fAZM6EkdW&j9I%@e>yD3aXEj^dp1|c9nUW2 zxy`P~{J&@FUx}OgQ_g9;TekH?is72cRpD1yY+OJ=FSb%9z9y{xNOGXxaf}| zGkHTJc0ak^D8r#DP+^_nJmXQxF`J~#3Oe~|iYua?eQ)exNa6^dbFN^y=-*%cHE(B# zT{t8XzAW}`wRxmFzWggeqFogMR)JIRcs>dv3kGmE$`1dzQNRS{=e`g7IS-d zwA}l?XKNXcwAGh*A)%u$*BmQK?`qP``!4Lg)hB#*>K$dJZ9=C5=lK2Um+5;Zx9X_# z`Tutk3+gVl0&U)0wBwO;%KF1;P9HZ|TwOagX7?%uACt9D4xRd7s;PJ^YAaL7g3aEZ zYfseMr?~I_w{nq5>*A+M`yV=8J+WMQLX%ZVK$M>pLpd|o#)=EpaR>|)z4*} HQ$iB}Z^v3q literal 0 HcmV?d00001 diff --git a/edje/view/useredit.edc b/edje/view/useredit.edc index a8d780f..cebea5b 100644 --- a/edje/view/useredit.edc +++ b/edje/view/useredit.edc @@ -39,7 +39,7 @@ group { rel2.to, "title"; fixed, 1 1; text { - font, 46; + size, 46; font, "TizenSans"; } color, 51 51 51 255; @@ -127,7 +127,7 @@ group { } } part { - name, PART_USER_EDIT_BTN_CACEL; + name, PART_USER_EDIT_BTN_CANCEL; type, SWALLOW; scale, 1; description { @@ -734,11 +734,11 @@ group { } } part { - name, "bg.delete"; - type, RECT; + name, PART_USER_EDIT_CONTENTS_DELETE; + type, SWALLOW; scale, 1; description { - state, "default"; + state, "default" 0.0; rel1 { to, "pad.delete"; relative, 1.0 0.0; @@ -750,43 +750,244 @@ group { min, 86 64; fixed, 1 1; align, 0.0 0.0; - color, 126 145 172 255; } + } + } +} + +group { + name, GRP_USER_EDIT_PHOTO; + parts { + part { + name, "bg"; + type, RECT; + scale, 1; description { - state, "focus"; + state, "default" 0.0; + min, 294 294; + color, 194 194 194 255; + } + } + part { + name, "bg.photo"; + type, RECT; + scale, 1; + description { + state, "default" 0.0; + min, 290 290; + rel1.relative, 0.5 0.5; + rel2.relative, 0.5 0.5; + fixed, 1 1; + color, 255 255 255 255; + } + description { + state, "focus" 0.0; inherit, "default" 0.0; color, 0 119 246 255; } } part { - name, PART_USER_EDIT_CONTENTS_DELETE; + name, PART_USER_EDIT_PHOTO; + type, SWALLOW; + scale, 1; + description { + state, "default" 0.0; + min, 284 284; + rel1 { + to, "bg.photo"; + relative, 0.5 0.5; + } + rel2 { + to, "bg.photo"; + relative, 0.5 0.5; + } + fixed, 1 1; + } + } + } + programs { + program { + name, "sig,focus"; + signal, SIG_FOCUS; + source, SRC_PROG; + action, STATE_SET "focus" 0.0; + transition, LINEAR 0.5; + target, "bg.photo"; + } + program { + name, "sig,unfocus"; + signal, SIG_UNFOCUS; + source, SRC_PROG; + action, STATE_SET "default" 0.0; + transition, LINEAR 0.5; + target, "bg.photo"; + } + } +} + +group { + name, GRP_USER_EDIT_SWITCH; + images { + image, "btn_switch_on_nor.png" COMP; + image, "btn_switch_off_nor.png" COMP; + } + parts { + part { + name, "bg"; + type, RECT; + scale, 1; + description { + state, "default" 0.0; + min, 104 54; + visible, 0; + } + } + part { + name, "icon"; type, IMAGE; scale, 1; description { state, "default" 0.0; - rel1.to, "bg.delete"; - rel2.to, "bg.delete"; + image.normal, "btn_switch_on_nor.png"; + fixed, 1 1; + } + description { + state, "focus" 0.0; + image.normal, "btn_switch_off_nor.png"; + fixed, 1 1; + } + } + } + programs { + program { + name, "sig,focus"; + signal, SIG_FOCUS; + source, SRC_PROG; + action, STATE_SET "focus" 0.0; + transition, ACCEL 0.2; + target, "icon"; + } + program { + name, "sig,unfocus"; + signal, SIG_UNFOCUS; + source, SRC_PROG; + action, STATE_SET "default" 0.0; + transition, ACCEL 0.2; + target, "icon"; + } + } +} + +group { + name, GRP_USER_EDIT_ENTRY; + parts { + part { + name, "bg"; + type, RECT; + scale, 1; + description { + state, "default" 0.0; + min, 436 64; + color, 194 194 194 255; + } + description { + state, "focus" 0.0; + inherit, "default" 0.0; + color, 0 119 246 255; + } + } + part { + name, "bg.entry"; + type, RECT; + scale, 1; + description { + state, "default" 0.0; + min, 432 60; + rel1.relative, 0.5 0.5; + rel2.relative, 0.5 0.5; fixed, 1 1; + } + } + part { + name, PART_USER_EDIT_ENTRY; + type, SWALLOW; + scale, 1; + description { + state, "default" 0.0; + rel1.to, "bg.entry"; + rel2.to, "bg.entry"; + fixed, 1 1; + } + } + } + programs { + program { + name, "sig,focus"; + signal, SIG_FOCUS; + source, SRC_PROG; + action, STATE_SET "focus"; + transition, LINEAR 0.5; + target, "bg"; + } + program { + name, "sig,unfocus"; + signal, SIG_UNFOCUS; + source, SRC_PROG; + action, STATE_SET "default" 0.0; + transition, LINEAR 0.5; + target, "bg"; + } + } +} + +group { + name, GRP_USER_EDIT_DELETE; + images { + image, "btn_user_del.png" COMP; + } + parts { + part { + name, "bg"; + type, RECT; + scale, 1; + description { + state, "default" 0.0; + min, 86 64; + color, 126 145 172 255; + } + description { + state, "focus" 0.0; + inherit, "default" 0.0; + color, 0 119 246 255; + } + } + part { + name, "icon"; + type, IMAGE; + scale, 1; + description { + state, "default" 0.0; image.normal, "btn_user_del.png"; + fixed, 1 1; } } } programs { program { - name, "sig,focus,delete"; + name, "sig,focus"; signal, SIG_FOCUS; source, SRC_PROG; action, STATE_SET "focus" 0.0; transition, LINEAR 0.5; - target, "bg.delete"; + target, "bg"; } program { - name, "sig,unfocus,delete"; + name, "sig,unfocus"; signal, SIG_UNFOCUS; source, SRC_PROG; - action, STATE_SET "unfocus" 0.0; + action, STATE_SET "default" 0.0; transition, LINEAR 0.5; - target, "bg.delete"; + target, "bg"; } } } diff --git a/images/ic_user_profile_current_01_foc.png b/images/ic_user_profile_current_01_foc.png new file mode 100644 index 0000000000000000000000000000000000000000..8181db787c388d4584f58e65ad37f973358e501b GIT binary patch literal 5765 zcmbVQcQ{;a(_aJ|BDyHSW{F;QS6jkry96P+Rf5$8Th!H8jS>lwh#*R&NR((nMDHS^ z1Q9i>1kr;KCBDt`KF|Aof4tZG$9JxC?lNcQH*?QDbFTYLqOp-K69X>;003apyNWcW z^!a}tARVPm9&neYbUgkjw7(h7%|8g^>k80x!8y5t^n5VxuBNUSmtaD#t119M42bCCjrCI@s)7H)RiTXkkY&N3zgYae z)WH8T3TnHRN0@Bsb+1C^A?}@{L{vcwUZ~^{mV2Y*xT7nPW(D2{DSiip=MRA!d5rdb7%0Og& zeEzKKFK$17Q`i4B<3DoynFr%tWldfEZ~?x~l>KlM`bU`JyZ^4}4x!?bl2;0lm`Wc9Fq{ur#Y>pyxuDSH2wMg3P< z6>VQvj6crT9EbD%CjyK;aQ-+y4;&t(ZKenkv+~5c;DY?b|7_2{R*Q7?^$c`%(ecIk zfd2BYisygO4}~h}C@aG#4HSk_fI_ukii*nea&n5wI+`dgMFsHRvM&E0pUF~;k^K`K z|0h`fAyFdm&+y-&PnrBXd0erSjPa$U#;DWcbpU|vjUH0doH(&|<7}PLD6hSWemv|} zPSU+(gZPDe?>WxuWxd2om=Lm;5}yp`lV>E`eav&|QpA*)c+J6VCd2(iy`K9lA5Ui9 z%}zIapAvqbs-ModZ-zJR2UEJp@tt?gZ^mky_Db1;gM)Pn#3a@VYc&d}&5Hn>44nB| zv_;00k%UIvpAnS=hlB>o+r$*7sW0p4LuPHW!=NzA7|-8L_I1{EmUZZZ(ya@PJ`ye0 zO!UW1$1TTo#|SwsqMN)@3+CEf`sYZfhLKw%oh|n6xnOI z6t_pJ2vxIe2;pOmMXNAcU~)hV9weQ~I5Ka~)+ClAGG)>;Z~hFm-VavmK3q2-`?U2+ zw9Jj>*BQf+==Q_k&SX4Un7oPL=j&dTY|tX6?x~$2mg1WjAT#jW0p*HgL1O1`F{m?b zsSbv02sJz^z1i**p1Ku5HsW+V#z$>!TF%e$kpbipu&O9aeW7N^LFpiwA>;--%{grtTstwN@D*NoVKM(-c4;1D~}EG4X5Y3 zDr7+#LI%vkNqj$c-nCU-I|vn1*?uNIFc1XXyc1ds!IDllKN&Bj znYr9xA?@gI+y$R@(B0W-Z}S2Z`91g}TMi2_gkxq-$DY@5ou7G*j}x}O10Al**scJh zNnXzxrJr)OUh3q}IIss+EEe}(C=8)GwUt?uvUAT7;ApVZeMNgtba3fstjz*xWV~MNa#fv&=-b>*gUs!{Pd0egJ78XS6y2#Wg{-jcf4J4@UMSxnD`~RgClh}yYF-C$2l?}&8?t!^2!@+ zTAs8osz%0kF*B_ww>{kF>a2~+U`ZQGpt5T{J$KbPk}r-K-}qQ>_h%6xIbSOh@tL); zK_zwx9b+l+Frd!9?Th7OY^+6&qLFiRp_tQG7^maVSMT(M^-$H=CHh;?XuF{Y8M*}x z0j| zG@9pjE>*$saXOZ3?BZ?9nz^3rXn9>6lEg7eR=J*M+#6{0-pSWPHi7Up*OI!UTdaH= ziy0v3i;`1$tC*D>T`N$1FIMT!CnBxGJp!$F?dZ+e5$H?ZhBcVc?LxgzzOMjPBrZEF zqvm$9K%!ELTtppfb9Tq3x&c8DSB0T!u{!w7QG3+!3TJ6fMMq!Tncz)>8WML%)M_Q| zS$lW#awU2^a=y4V;JLv*1of*!Og#NIo85Pr7pjZ0Aenq%+7TU~*<$a>ArV#KjeM18 zA55U2;~l*Ct}*C0-Y>p8N_NNG=8c`r=tkFBWDoPsc#n8%=#K&h2zOmfy&O+HI+u%s zxulE`7Ld?a+(oCMmvo-=nlRhA#u$?g@mNNs_pqCBOF@kWUru_#(o!<5c7C0T*w{?n zjTxn;qYrBN7|(G!naCN?F*GXoGEU=iJB;gXdT%GfZqhD2;Z!?ll2}s$g@}J4?J;pU za&kICNGJ(g5`bW+W-WL{Tu`zmIod{FvNDN_mN~fa&FNnCHO4xDGoT;yaqQ!;E@Q)U z(kQmexUAYeOAAd}Zoqq@9rw)aR%)tyXZ8w%p3soAVmn+fic91R;@Uw*K)?HVPgM4j zSG{Ly)4XUOJIm-jse7VLLpHKLZx&=-p{^HDEEDjt0xsRHFUM{1dg^4z{B8(n;heQV zuH#9S|GlFpSZ={I_r^W?@_-~v=3TQeF)irW9QS;z8q?jPgSA!u-ul(_F2a@8;lfbn zUp_aN%y^3c;T8E&ac3jA)mc*AT1yuWHr48VT0CW*8LomP`EoG3gH> zu(#BT>X5#6Sq;5cL+`7Gs$dwTms+SS`0k?wTEw{)qe`fE&+gQDd(J60BA-wX4*R|e&r%{v7sCStIEsOlFf!Q?)bRrFb zCxwMih*T!Y^s&p3o97}lW1Zi~vEGjAV}qQGBY9bo9Y~mg<%q;ivSAzR^!-j)JjCe$ z9Btv%iN*taH`~0BT7}zT5#=C*!Vr_oLI-W;%FmK`4N5g(r z>(?6hr+LZ&Gvow|Yhfl|c6eHg{0bvXOt?VNro|P&!1lDcDFf3O0~g)WZiyZp$_I)1 zq&*KEkl*ek(PSF-h4fNHXWnscxNwW}p>DT1X|MF~@H3&lybd^+au4ekI52(TLiNIr zefY@HoLGyeoqz|Mv+i8%ow4K^Lt1VG=tkLU>ISde_NAU`n$M!$>-|Z|fVArF{>)h+ zw}GNkJ>f-js(9cGqQj~V8FV9^TTLiPA9k)QD{Y}OdDrjuMB?NljYdSdQpu*w?Zg8} z&$4`((B}fBiO%(ml6>lObU%9{aRlI67X* zN?(lQ!C1!@*=p`?*Y{>V&srGzhDdQ}F>9U6RZ);$}!up7|zs9E}z#>87X zyGY@@Qz&)tc_zMc`;S-I%l5*OVu*AFAg1QGb< zo?h=+iexN3{cJ&Xcvr|`DPw@%lO3yVx_Hikv@YP|doXwOr$=mZ9h)XH! z5W&hTCu5H3kwuMabPEHN$Qjts#5Ut6OWP2h zxuWsPcH&d5;U!$(o>!b0ud0MTB|QElv@3P$c;6@xgp(KW?&SFGU|SbA8Fm%(G^Av# zEg*wshP6gtlPC&&VKaFm?48p^ST);i>ENh+n|nGdBPFOnrQ>PL_U(Fm11{n83Zm1; z`1t(dAyXUuFx;MoD>9{YvuP<9Bz%*JPlCRpY3z&ew{?J9xy-(EQnz;UiP?PYeIM7y zG7rx35F)Vf32Tuws73NusY=yZ{MYC5HIvujpCpp9p9W8zcwj7-p55VW>x;YmNp-Ao z3{j?6)#K2$o;wB}7yMZvV00p1TPivA!Ke9p#lg?Y>Md_FoXjlHy3Q6M8fHm+Rc=mq zw0U!sXV$Q)9)Ni7qr}kn5>PcTz-T>GLwlSHd6BwQ)m$E5ZWA9}WqrMF=4ScG2S-8a zlGS%tX)|vq)?ha}_Nqn{sgQa_})HeW{AL5^N^eW9sbod@p~aKfmdL^tNH`N9U_tKNCZ~OKfbK zaXJRV)0B3tFndynW9zZ@$oSIf{IZuB_@;nkvh~#do3V&@#Q?@`%d!58Ig8;|+vv7^ zYr&nPtUH`#y9u({T-+&zom2Z(D3@txp%!sVT(n>r?V8`c%khhC=Mgs;zvtC5MlMwZ z4mU4%SA480Tk+;}bn|wc?kEmdH9CJ}A7q1Qj2zN(TjiFPR$?o+9PjV;n$U$m>^?N5 z&E&bYMfY1o6+)U1;J{WQD>dOosaoC|-Fs!ijh7?#zt}tRuNFZVAthw=jk+9{XuTFW z)It5^70(>1jUZlkVO}Si>js1=+QVpQ`mdvN1?mq^I+v9MR?pV%v&&|8G)TONeJcsS z{flZyeDnG238ZDd-Wiv6NNtS{g??yMI*W;DC!G;K5SRDd)=-MnVx_@mcOE--W-oQENcV5eWEckak;;7JHV z@NguoB%2>Gd%v?f4~?<5<#gm7$CT153^PKB&-U3in$ZXHkHlG2P95gY6`TV{4U0&2 zsNc%4?v8y*vd~LHH4|VDxsP|!?sgOQr&UPtS1nfK&ObY7lhELJr*56mi_-uu;ZL0N zl22+&RPtx5)D~^VCW`={Vr|nImT1`}pGP6% zn$z!gM=>sH7B5H6EUiv>@E2a-6N<<$d$URTYuSy;{#Nf8&vWWV-P|QyDLv)#_S$jB zbaiyy{@p_tGOp%~x;<^CwZVZ-nbLD$RmxA1wBJt8x4w|dm^RXm-kulT{wlTETuP{n z;b90f%cSN0NvwELg6N;DtefQ;gWop1_>grW;F9;vcuoKzf-44YX-iYC?*-8!7lysC z28S7;3sR5P+O{HsQbSE>vEN`LAJpzfQF236XQHl^BSjvha7A@6iRpv0#u8^Wc*W*1 z*>af^#3mnGZwBVMvVC+zK9f2-6mSVJua^$g_Io_$A&fCv$ZAVk<9X%&b8WVB54;Za z6~f*frb)>H+yH@T(`yn4g`A#0#uQ{#qBR;*j zh7^^#{R-d%N@Vt($0!zXRkH=A(o)NH8;5y;@oFrBY+mQLfH?Yhqp3M(qw0ab4wb(% z%YLUu5;kgkfW!gx&d1A%K7Enn5oy==%OXyyWq^461;8n z!gcrO!&CiB;5K)Cbn;61S(Z)%dM+h3)d%>TWq+>H*BoX;i?@>e$zO9X)zx_4QxW>! zem!%6{g@+^D&uSayU8`>X@E!`kAYXM-5W~~vrxCD zjR$~?1~*XAf~-43DUw)f@4oj0!w4PHxAr!2*DTc}gL_VYOc`~ z-9=q0@R{HI^XKmAD1CX^wW4FnA?=Gk;prJj5K|dDGcs`TK7ibshw^KV!cBRH|16+> zg2&FOT>K2g?A*Ah$)wM#vrUfvXtf>3mO1u;Uz7eby15RmQC;s=KC@q}eAlri1y=SBAKD4gT+t{n zzfbFNtK;F&5--nvrtca@%Z-*Cm(59(V$PETaF5il9yk1xnIBj4^^EC%OtPkw+oKEvSK@8nu_I)18;%3r}6xIin_czPwdV}a!fE-{^w#41vHMqm{Kbe`wL#{@2b)1 cwmKCZK#qau*mJHn>rY`=4`qZb({hadA2@Mi=Kufz literal 0 HcmV?d00001 diff --git a/images/ic_user_profile_current_01_nor.png b/images/ic_user_profile_current_01_nor.png new file mode 100644 index 0000000000000000000000000000000000000000..975ac7fb285f9e78b702eca448e8d6ade1402630 GIT binary patch literal 6116 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 Oxw|gT2wRDEi2g5px7@J+ literal 0 HcmV?d00001 diff --git a/include/defs.h b/include/defs.h index 51f959d..148e6f7 100644 --- a/include/defs.h +++ b/include/defs.h @@ -37,6 +37,10 @@ #define GRP_USER_ITEM "group.user.item" #define GRP_USER_EDIT "group.user.edit" #define GRP_USER_EDIT_CONTENTS "group.user.edit.contents" +#define GRP_USER_EDIT_SWITCH "group.user.edit.switch" +#define GRP_USER_EDIT_PHOTO "group.user.edit.photo" +#define GRP_USER_EDIT_ENTRY "group.user.edit.entry" +#define GRP_USER_EDIT_DELETE "group.user.edit.delete" #define GRP_BAR_ITEM "group.bar.item" #define PART_HOME_MENU_BAR "part.home.menu.bar" @@ -60,6 +64,8 @@ #define PART_USER_EDIT_CONTENTS_ACCOUNT "part.user.edit.contents.account" #define PART_USER_EDIT_CONTENTS_LOCK "part.user.edit.contents.lock" #define PART_USER_EDIT_CONTETNS_DELETE "part.user.edit.contents.delete" +#define PART_USER_EDIT_PHOTO "part.user.edit.photo" +#define PART_USER_EDIT_ENTRY "part.user.edit.entry" #define PART_BAR_ITEM_BG "part.bar.item.bg" #define PART_BAR_ITEM_ICON "part.bar.item.icon" #define PART_BAR_ITEM_ICON_FOCUS "part.bar.item.icon.focus" @@ -102,4 +108,7 @@ #define IMAGE_USER_ADD_FOCUS IMAGEDIR"/btn_user_add_foc.png" #define IMAGE_USER_DEFAULT IMAGEDIR"/ic_user_01_nor.png" #define IMAGE_USER_DEFAULT_FOCUS IMAGEDIR"/ic_user_01_foc.png" +#define IMAGE_USER_CURRENT_DEFAULT IMAGEDIR"/ic_user_profile_current_01_nor.png" +#define IMAGE_USER_CURRENT_DEFAULT_FOCUS IMAGEDIR"/ic_user_profile_current_01_foc.png" + #endif /* __AIR_HOME_DEFS_H__ */ diff --git a/src/utils.c b/src/utils.c index 1f78641..c309f50 100644 --- a/src/utils.c +++ b/src/utils.c @@ -191,9 +191,15 @@ Evas_Object *utils_add_button(Evas_Object *base, char *text, const char *part) Evas_Object *utils_add_entry(Evas_Object *base, char *text, bool password, const char *part) { - Evas_Object *entry; + Evas_Object *ly, *entry; - entry = elm_entry_add(base); + ly = utils_add_layout(base, GRP_USER_EDIT_ENTRY, false, part); + if (!ly) { + _ERR("failed to add entry layout"); + return NULL; + } + + entry = elm_entry_add(ly); if (!entry) { _ERR("failed to add entry"); return NULL; @@ -209,12 +215,12 @@ Evas_Object *utils_add_entry(Evas_Object *base, char *text, bool password, elm_entry_input_panel_language_set(entry, ELM_INPUT_PANEL_LANG_ALPHABET); elm_entry_cursor_end_set(entry); + elm_entry_scrollable_set(entry, EINA_TRUE); elm_scroller_policy_set(entry, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF); if (text) elm_entry_entry_set(entry, text); - if (part) - elm_object_part_content_set(base, part, entry); + elm_object_part_content_set(ly, PART_USER_EDIT_ENTRY, entry); evas_object_show(entry); -- 2.7.4