From 5c275633a1cfcbf61f0b23b0d6aa9faec0c99d43 Mon Sep 17 00:00:00 2001 From: Jisung Ahn Date: Fri, 28 Dec 2012 13:29:44 +0900 Subject: [PATCH] merge master Change-Id: Iedf21e9c047c416f562bf647b67e4004f7e634fa --- common/src/ivug-db.c | 6 +- main/layout/ivug-crop-view.edc | 2 +- main/layout/ivug-setas.edc | 215 +++++---------------- .../images/01_Control icon/00_winset_btn_prev.png | Bin 3235 -> 0 bytes .../01_Control icon/01_controlbar_icon_trim.png | Bin 5335 -> 0 bytes .../01_Control icon/01_controllbar_icon_close.png | Bin 1076 -> 0 bytes .../T01_1_controlbar_icon_Rotate left.png | Bin 1528 -> 0 bytes .../T01_1_controlbar_icon_Rotate right.png | Bin 1507 -> 0 bytes .../T01_1_controlbar_icon_detail.png | Bin 3273 -> 0 bytes .../01_Control icon/T01_1_title_icon_device.png | Bin 1349 -> 0 bytes .../01_Control icon/T01_1_title_icon_set_as.png | Bin 1520 -> 0 bytes .../01_Control icon/T01_Option tray_Edit.png | Bin 5876 -> 0 bytes .../images/01_Control icon/T01_Title_icon_more.png | Bin 3061 -> 0 bytes .../01_Control icon/T01_controlbar_icon_add.png | Bin 3009 -> 0 bytes .../01_Control icon/T01_controlbar_icon_addtag.png | Bin 3930 -> 0 bytes .../01_Control icon/T01_controlbar_icon_delete.png | Bin 3095 -> 0 bytes .../01_Control icon/T01_controlbar_icon_save.png | Bin 3238 -> 0 bytes .../01_Control icon/T01_controlbar_icon_share.png | Bin 3310 -> 0 bytes .../T01_controlbar_icon_slideshow.png | Bin 3183 -> 0 bytes main/src/control/ivug-parameter.c | 9 +- main/src/include/ivug-main-view.h | 4 +- main/src/include/ivug-slideshow-view.h | 1 + main/src/slider/ivug-slider-item.cpp | 5 + main/src/view/ivug-crop-view.cpp | 4 - main/src/view/ivug-details-view.c | 23 ++- main/src/view/ivug-main-view-toolbar.cpp | 15 -- main/src/view/ivug-main-view.cpp | 6 - main/src/view/ivug-name-view.c | 5 - main/src/view/ivug-setas-view-callerid.cpp | 16 +- main/src/view/ivug-setas-view-wallpaper.cpp | 6 - main/src/view/ivug-slideshow-view.cpp | 23 ++- medialist/src/ivug-data-list.h | 1 + 32 files changed, 116 insertions(+), 225 deletions(-) delete mode 100644 main/res/images/01_Control icon/00_winset_btn_prev.png delete mode 100644 main/res/images/01_Control icon/01_controlbar_icon_trim.png delete mode 100644 main/res/images/01_Control icon/01_controllbar_icon_close.png delete mode 100644 main/res/images/01_Control icon/T01_1_controlbar_icon_Rotate left.png delete mode 100644 main/res/images/01_Control icon/T01_1_controlbar_icon_Rotate right.png delete mode 100644 main/res/images/01_Control icon/T01_1_controlbar_icon_detail.png delete mode 100644 main/res/images/01_Control icon/T01_1_title_icon_device.png delete mode 100644 main/res/images/01_Control icon/T01_1_title_icon_set_as.png delete mode 100644 main/res/images/01_Control icon/T01_Option tray_Edit.png delete mode 100644 main/res/images/01_Control icon/T01_Title_icon_more.png delete mode 100644 main/res/images/01_Control icon/T01_controlbar_icon_add.png delete mode 100644 main/res/images/01_Control icon/T01_controlbar_icon_addtag.png delete mode 100644 main/res/images/01_Control icon/T01_controlbar_icon_delete.png delete mode 100644 main/res/images/01_Control icon/T01_controlbar_icon_save.png delete mode 100644 main/res/images/01_Control icon/T01_controlbar_icon_share.png delete mode 100644 main/res/images/01_Control icon/T01_controlbar_icon_slideshow.png mode change 100644 => 100755 main/src/include/ivug-slideshow-view.h mode change 100644 => 100755 medialist/src/ivug-data-list.h diff --git a/common/src/ivug-db.c b/common/src/ivug-db.c index cfca679..d9b6ba4 100755 --- a/common/src/ivug-db.c +++ b/common/src/ivug-db.c @@ -326,7 +326,7 @@ media_handle ivug_db_get_file_handle(const char* filepath) return NULL; char buf[1024] = {0,}; - snprintf(buf, sizeof(buf), "MEDIA_PATH=\'%s\'", filepath); + snprintf(buf, sizeof(buf), "MEDIA_PATH=\"%s\"", filepath); media_handle m_handle = NULL; @@ -382,7 +382,7 @@ media_handle ivug_db_get_folder_handle(const char* folderpath) filter_handle media_filter = NULL; char buf[1024] = {0,}; - snprintf(buf, sizeof(buf), "FOLDER_PATH=\'%s\'", folderpath); + snprintf(buf, sizeof(buf), "FOLDER_PATH=\"%s\"", folderpath); media_handle m_handle = NULL; @@ -680,7 +680,7 @@ tag_handle ivug_db_get_tag_handle(const char* tagname) filter_handle media_filter = NULL; char buf[1024] = {0,}; - snprintf(buf, sizeof(buf), "TAG_NAME=\'%s\'", tagname); + snprintf(buf, sizeof(buf), "TAG_NAME=\"%s\"", tagname); tag_handle t_handle = NULL; diff --git a/main/layout/ivug-crop-view.edc b/main/layout/ivug-crop-view.edc index c93ff08..9e5f663 100755 --- a/main/layout/ivug-crop-view.edc +++ b/main/layout/ivug-crop-view.edc @@ -22,7 +22,7 @@ #define PROGRESSBAR_WIDTH 100 #define PROGRESSBAR_HEIGHT 100 -#define NOTIFY_HEIGHT 40 +#define NOTIFY_HEIGHT 47 collections { group { diff --git a/main/layout/ivug-setas.edc b/main/layout/ivug-setas.edc index a60a67b..f5ac4b6 100755 --- a/main/layout/ivug-setas.edc +++ b/main/layout/ivug-setas.edc @@ -18,6 +18,8 @@ #define PADDING_VISIBILITY 0 +#define NOTIFY_HEIGHT 47 + collections { #define PROGRESSBAR_WIDTH 100 @@ -39,6 +41,47 @@ collections { } } + part { name: "setasview.contents"; + type: RECT; + scale: 1; + repeat_events: 0; + description { state: "default" 0.0; + color: 0 0 0 100; + align: 0.0 0.0; + rel1.relative: 0.0 0.0; + rel1.to_x: "bg"; + rel1.to_y: "bg"; + rel1.offset: 0 0; + rel2.relative: 1.0 0.0; + rel2.to_x: "bg"; + rel2.to_y: "toolbar_bg"; + rel2.offset: 0 -NOTIFY_HEIGHT; //for notify + visible: 1; + } + } + + part { name: "setasview.contents.swallow"; + type: SWALLOW; + scale: 1; + repeat_events: 0; + description { state: "default" 0.0; + rel1 { relative: 0 0; to:setasview.contents; } + rel2 { relative: 1 1; to:setasview.contents; } + visible: 1; + } + } + + part { name: "setasview.contents.swallow.notify"; + type: RECT; + scale: 1; + repeat_events: 0; + description { state: "default" 0.0; + rel1 { relative: 0 0; to:setasview.contents; } + rel2 { relative: 1 1; to:setasview.contents; offset: 0 NOTIFY_HEIGHT;} + visible: 1; + } + } + part{ name: "setasview.photocam"; type: SWALLOW; @@ -49,8 +92,8 @@ collections { description { state: "default" 0.0; visible: 1; - rel1 { relative: 0 0; to:bg; } - rel2 { relative: 1 1; to:bg; } + rel1 { relative: 0 0; to:setasview.contents; } + rel2 { relative: 1 1; to:setasview.contents; } } } @@ -64,8 +107,8 @@ collections { state: "default" 0.0; align: 0.5 0.5; visible: 1; - rel1 { relative: 0 0; to:bg; } - rel2 { relative: 1 1; to:bg; } + rel1 { relative: 0 0; to:setasview.contents; } + rel2 { relative: 1 1; to:setasview.contents; } } } @@ -110,26 +153,8 @@ collections { description { state: "default" 0.0; visible: 0; - rel1 { relative: 0 0; to:bg; } - rel2 { relative: 1 1; to:bg; } - } - } - - part { name: "setasview.contents"; - type: SWALLOW; - scale: 1; - repeat_events: 0; - description { state: "default" 0.0; - color: 255 0 0 100; - align: 0.0 0.0; - rel1.relative: 0.0 0.0; - rel1.to_x: "bg"; - rel1.to_y: "bg"; - rel1.offset: 0 0; - rel2.relative: 1.0 0.0; - rel2.to_x: "bg"; - rel2.to_y: "toolbar_bg"; - visible: 1; + rel1 { relative: 0 0; to:setasview.contents; } + rel2 { relative: 1 1; to:setasview.contents; } } } @@ -161,145 +186,3 @@ collections { } } - - -collections { -#define BTN_SET_CALLER_IMAGE_WIDTH 86 -#define BTN_SET_CALLER_IMAGE_HEIGHT 86 -#if 1 - group { - name: "setas_view_btn"; - - images { - image: "00_winset_control_toolbar_bg.png" COMP; - } - - parts{ - part { - name: "base"; - type: RECT; - scale:1; - mouse_events: 1; - repeat_events: 1; - description { - state: "default" 0.0; - color: 0 0 0 0; - rel1.relative: 0.0 0.0; - rel2.relative: 1.0 1.0; - } - } - part { name: "controlbar_bg"; - scale: 1; - description { state: "default" 0.0; - min: 0 CONTROLBAR_SMALL_HEIGHT_INC; - max: 999999 CONTROLBAR_SMALL_HEIGHT_INC; - fixed: 0 1; - align: 0.0 1.0; - visible: 1; - rel1 { to: "base"; } - rel2 { to: "base"; } - //image.normal: "00_winset_control_toolbar_bg.png"; - } - description { state: "hide" 0.0; - inherit: "default" 0.0; - visible: 0; - } - } - part { name: "controlbar_clip"; - type: RECT; - mouse_events: 0; - description { state: "default" 0.0; - rel1.to: "controlbar_bg"; - rel2.to: "controlbar_bg"; - visible: 1; - } - description { state: "hide" 0.0; - inherit: "default" 0.0; - visible: 0; - } - } - part { name: "elm.prev_btn_bg"; - type: RECT; - scale: 1; - clip_to: "controlbar_clip"; - description { state: "default" 0.0; - min: 0 0; - fixed: 1 0; - align: 1.0 0.0; - rel1 { relative: 1.0 0.0; to: "controlbar_bg"; } - rel2.to: "controlbar_bg"; - visible: 0; - } - description { state: "visible" 0.0; - inherit: "default" 0.0; - min: NAVIFRAME_TITLE_PREV_BTN_BG_SIZE_INC 0; - } - } - part { name: "elm.swallow.prev_btn"; - type: SWALLOW; - scale: 1; - clip_to: "controlbar_clip"; - description { state: "default" 0.0; - fixed: 1 1; - align: 0.5 0.5; - rel1.to: "elm.prev_btn_bg"; - rel2.to: "elm.prev_btn_bg"; - } - } - part { name: "controlbar"; - type: SWALLOW; - scale: 1; - clip_to: "controlbar_clip"; - description { state: "default" 0.0; - fixed: 1 1; - rel1.to: "controlbar_bg"; - rel2 { relative: 0.0 1.0; to: "elm.prev_btn_bg"; } - visible: 1; - } - } - - part { - name: "selectioninfo"; - type: SWALLOW; - description { state: "default" 0.0; - fixed: 0 1; - align: 0.5 1.0; - rel1 { - relative: 0.0 0.0; to:"controlbar_bg"; - } - rel2 { - relative: 1.0 0.0; to:"controlbar_bg"; - } - } - description { state: "hide" 0.0; - inherit: "default" 0.0; - visible: 0; - } - } - } - - programs { - - program { - name: "hide_menu"; - signal: "elm,state,hide"; - source: "event"; - action: STATE_SET "hide" 0.0; - target: "controlbar_clip"; - target: "controlbar_bg"; - target: "selectioninfo"; - } - - program { - name: "show_menu"; - signal: "elm,state,show"; - source: "event"; - action: STATE_SET "default" 0.0; - target: "controlbar_clip"; - target: "controlbar_bg"; - target: "selectioninfo"; - } - } - } -} - diff --git a/main/res/images/01_Control icon/00_winset_btn_prev.png b/main/res/images/01_Control icon/00_winset_btn_prev.png deleted file mode 100644 index d45184dc789442a871526c4b77a1b5374729d086..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3235 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 diff --git a/main/res/images/01_Control icon/01_controllbar_icon_close.png b/main/res/images/01_Control icon/01_controllbar_icon_close.png deleted file mode 100644 index 91b04e56cda2ca04c0272a8608bf76b9e2aa0185..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1076 zcmV-41k3x0P)E=0000PbVXQnQ*UN; zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#)=5M`RCwBA{Qv(y11`VT*e#D^In4P&z)NirfS0I^YYN~0T%Ecpbg18xE%KGy;S5F^E2`H$pMIGYLC>G-_D zfXgfYv6+C^wEzKxR}vq9hdb1(e}I@7$!g?a2Ze4l(EH0!Y(xqpWGBc#HNag63O8IK zzzEgAfTW2L-4#q&ob(?}1A3$|pr0|vp%#KH62+3zRS8&x5oPEW;tEnRq&$h7L(q#A^un6~SEeWA zLu7Cdh!shQCY1a^tPjx(5k@RN#%2*CwgQHnR4Pq`FAq>7Ti}bMJ4D1W(H0U)42;ke z%SfulxGXdyA&ziatVnJur3etr_`|L&1qi^78KWQ!1W^=&w@50%V|WD%%XmKT;T>!P zR;ett3?weh!lKU1|3j+9fmDG!CYkwvf9mhBexT=vtFMLC;ZYQ$C7yp3FU32Q>fhI; zNH(440wQJkJUeO6)|6)Ue9nO7dL$!{_+gpDTM(A&#!P7kLN(Z3at90?0jLGr!P54z z7TRe{t1lS)4XsY8&X}P=pb(6i((#9*mvvZMOSJ*BjxnCBzlJ%yI6kTc0~I|tgj@T zB*sP-mqc%6GCS}$1bnheADSpdo7}x-PW<|>K5)6wiWSlg`Y3tCD5=1gE5pt%H~I!?1sKKr!3U_PJ^T*FxE87$BR*d*_*M->$jtPixp udn(r!xeJ#+#C=R@lewE!?TV z96C6q1(+j3g*l+(BMi(M9R)qeDbe!PR31WBV1^l$pvH_yd%SF#=$rYT^ZWh&kMH+p z#_ARG{KNbK0Q1sT>I~wZ#pH5g=oh1AMTJZapt+GN>OWWlX)VgeNJBt!w46wHv5E@te6Qw>k(65`qWjKI(YL?}|j zlSyUiGoWOaC!rWQDzl(U3{pnRv1k;J#+O416hjeAfuJfGh7vI<0>z-I0gKUiYd&Gn zrB1~XZ)&(u5I6!s91e%v5hZ8&0tCZx96=R`LLn0oGW$kGFgs<8Jz`oxN7^ks#R(M4 zKwd?29$O-)VKLLm5@>Elma$K@No*M6G;;_hN4+IY1NHjXG?gC_;L9W-cTHo%#&t;-9t$ zV;9Vfg-p|_VNpR&QC1>Zk*d+DqLQ^@voS0M(?n}j8cZ3bicu(|a15X3>R3w&O)|nX z*ZPF3o0aRe0?mn$btF%flGaq7rJ;$E32OFSG_&eWajmoGqMenCh{+({kNw9-Pd|z7 z@g8SvD_&-dPcow0dC}Hu@^bv&*&PT@NCVb5ESYU0W|OB;fg-Cl?< z?(}h;*&F=hjlz+gMX75;gTOPS@`bPR;lYENX8OV=-HGL;?dIuU=f zGj{zo+nojAJGE)WihbFG*IB<@XJ{dEm=u(7NjqC>$77g7a}|e7v>2H=zFTW+Uhu8wwcmi}TyLrlJ3VPs>AN zW|i-9`%Uz5L~D6Mh;8@n9d-SN)9>{^DhAcVWuA3({GvAsViWPpj`tzY+#fU#S1mhP z4HlhRuk-)&g23i@*Tkh&UpE2CwXyo3kC#M1i~DLCo6Etxr~2Zz5Ik-yX3Je&<5 z*!AnMO2_Ru?2ql;J(ey!_U~_B=1zR2sjVtu-9U%C7>s*;-IqTkH#@%_!`^Z7pa zr6kAs`M%-{0PstQH>8Splxr{Z7SCon|CV?K3C1*GBby~SEIbADB%4V=35+G1N~J7h zVSX>A0l*Wc&1piKDT%PM3}SI%5GTWlYydPmCugzdQUa7oWz#k-{6~8y4AG<(-mEZT zCN74`q2r5qYGYBd*;dhKOcjn}ghEANIJB@}(Hl=@5vhjQ z1z)12g>wXfBT&@ga3GEdgypkQT&-54m<*N4!bL>5z0f9DoZ&Wmh+Dxx*{wXy2{dbi zT#A-Vwm{IrVx&(~V7NtDn|+~7V!=?Sg+p-!bEV`4noR!>Wtc^@T}Y*##rvPac5@*| zp{bOeE#R$UV!;ITQupf@{jj2%6|lwkpTx*vd`k{4bs@k>lI)di#F+rMlx^e)Kc>Biws=4+sDr zQD7O6KtNjj)OfgJ|Apqh$=iKH*IIJ}jd_TqCA&>?E^p*W>EAm#4dDI9r(@6dd4l>u zBgh!Ir)l{x{bV^*4oN}%2qKx-dg^*X!;bEV-)h_Cn-`hwvn9V{!luJ??JjBBJ9kg&TI#$9 zN=D__pfVO5(TCTLljC3LS|a^x0t5W(_g(WBB&+w#CJs)nDXy7|TG`deJ!#k)z*g1{ z%|$H-_BnL=E`-GAH~&&IW8`!-SDqUU`8s#)qvUV$Zw%yp&{R>_eF-z4D024r_BM^Z zSUmmxoz}qB%BX>=gSW0{-`78w)l3KvefIjmkM8_+`e^*l;GlXf>eL0^>rOh}u>mCN zxO9)Is`b*Oo#>n--yA#fT3Gc&>$K+x;Gg5y&&-=;?BOg wfomEG`l0P@RmBs$m0z>iXm{6tJrOMN2K`>+5qpO>serf=jLC*m(HW)x0HV$#kN^Mx diff --git a/main/res/images/01_Control icon/T01_1_controlbar_icon_detail.png b/main/res/images/01_Control icon/T01_1_controlbar_icon_detail.png deleted file mode 100644 index 9e746c87882663cf36738ad04a4c82cb4a828795..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3273 zcmV;)3^wzLP)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} z0005>Nkl7*egP;Ap%uw~C_qU)0BdVJ$s$^jxoUeA z-L@K#WCdVj46ma4;F~dS8WND?D}ec5aCKQkmQIG`7{K_5T&v`NlRD=sa_;CQT>FT(<+ zCc8wYad8IObL~@`02~@(V)~$Q54a_H9W{d%c`hQa!GR%W8Pez_l>ojBq1Pls78z4< z@r3gRe8??NH;Mj3o;M^n5i@8hE*oz+Pr&=!_TVj1%S-#|q%BqkC0VNHwh1^diQb-z zJiP!d8C*66SnC=*m+r+ggBE)@*}X_A(@pQNu0M2{Vf|Gn;0E})939nJfO2H8cLZ(% z;G=Fhk2Pq0*_h-!t=SoV&TK{=){zVFP_lPkMJM-nGILKj55WIO?1khw+J4Y-ak)y{ zq}PzmcJi>NgNnLM?b*BcWlJNwiE|p=$9NrJ2iO6+j_&~gQRd-tbpWc%00000NkvXX Hu0mjfQ;iJw diff --git a/main/res/images/01_Control icon/T01_1_title_icon_device.png b/main/res/images/01_Control icon/T01_1_title_icon_device.png deleted file mode 100644 index 9c9640303a7ccf0dff0c481dda9612868b79089c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1349 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 diff --git a/main/res/images/01_Control icon/T01_Title_icon_more.png b/main/res/images/01_Control icon/T01_Title_icon_more.png deleted file mode 100644 index 651c8e1e14b8e162e5001eae50b5d44f5dbf117e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3061 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 diff --git a/main/res/images/01_Control icon/T01_controlbar_icon_delete.png b/main/res/images/01_Control icon/T01_controlbar_icon_delete.png deleted file mode 100644 index c13897d9490876cb088e60ffda67078078898955..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3095 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 diff --git a/main/res/images/01_Control icon/T01_controlbar_icon_save.png b/main/res/images/01_Control icon/T01_controlbar_icon_save.png deleted file mode 100644 index 39baa6a2ede1733000ae98098034506eca3f19c4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3238 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 Y0G~tc&d7UTwEzGB07*qoM6N<$g1FW5_5c6? diff --git a/main/res/images/01_Control icon/T01_controlbar_icon_share.png b/main/res/images/01_Control icon/T01_controlbar_icon_share.png deleted file mode 100644 index f21b00c8d162512da8877374ddc4c226088055f7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3310 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 VmVIl9qsssQ002ovPDHLkV1g2jview_by != IVUG_VIEW_BY_ALL && - data->view_by != IVUG_VIEW_BY_FAVORITES && - data->view_by != IVUG_VIEW_BY_TAG && - data->view_by != IVUG_VIEW_BY_PLACES) + if(data->view_by == IVUG_VIEW_BY_INVAILD) { data->view_by = IVUG_VIEW_BY_FOLDER; } @@ -710,6 +707,10 @@ Filter_struct *ivug_param_create_filter(const ivug_parameter *param) filter_str->sort_type = param->sort_type; filter_str->index = param->start_index; filter_str->selected_list = param->selected_list; + if(param->filepath) + { + filter_str->filepath = strdup(param->filepath); + } if(filter_str->type == FILTER_DB) { diff --git a/main/src/include/ivug-main-view.h b/main/src/include/ivug-main-view.h index a7c6ca8..870a998 100755 --- a/main/src/include/ivug-main-view.h +++ b/main/src/include/ivug-main-view.h @@ -158,7 +158,6 @@ typedef struct { //flag bool bShowMenu; - bool bUseNFC; ivug_mode mode; ivug_view_by view_by; @@ -177,7 +176,8 @@ typedef struct { // Slide show; SlideShow *ssHandle; - char *ss_music_name; + + bool bClickPrevent; } Ivug_MainView; diff --git a/main/src/include/ivug-slideshow-view.h b/main/src/include/ivug-slideshow-view.h old mode 100644 new mode 100755 index 8f98dd6..a2a2053 --- a/main/src/include/ivug-slideshow-view.h +++ b/main/src/include/ivug-slideshow-view.h @@ -35,6 +35,7 @@ typedef struct { Media_List *mList; Ecore_Event_Handler *keydown_handler; + Ecore_Idler *homekey_idler; // Slide show; Media_Item *ss_curItem; diff --git a/main/src/slider/ivug-slider-item.cpp b/main/src/slider/ivug-slider-item.cpp index 36f127c..f11e296 100755 --- a/main/src/slider/ivug-slider-item.cpp +++ b/main/src/slider/ivug-slider-item.cpp @@ -755,6 +755,11 @@ void ivug_slider_item_play(Slide_Item* si) IV_ASSERT(si != NULL ); Media_Data *mdata = ivug_medialist_get_data(si->mitem); + if(mdata == NULL) + { + MSG_SITEM_ERROR("current data is NULL"); + return; + } MSG_SITEM_HIGH("Start sitem. Type(%d) State(%d) %s", si->type, si->state, mdata->filepath); diff --git a/main/src/view/ivug-crop-view.cpp b/main/src/view/ivug-crop-view.cpp index ed3b1fa..e3a234c 100755 --- a/main/src/view/ivug-crop-view.cpp +++ b/main/src/view/ivug-crop-view.cpp @@ -37,10 +37,6 @@ #define CROP_EDJ_FILE EDJ_PATH"/ivug-crop-view.edj" -#define CONTROL_ICON_DIRECTORY_PATH IMAGE_PATH"/01_Control icon" -#define ICON_PATH_SAVE CONTROL_ICON_DIRECTORY_PATH"/T01_controlbar_icon_save.png" -#define ICON_PATH_PREV CONTROL_ICON_DIRECTORY_PATH"/00_winset_btn_prev.png" - static void _on_layout_resized(void *data, Evas *e, Evas_Object *obj, void *event_info) { IvugCropView *pCropView = static_cast(data); diff --git a/main/src/view/ivug-details-view.c b/main/src/view/ivug-details-view.c index 0bd02e9..2172b4e 100755 --- a/main/src/view/ivug-details-view.c +++ b/main/src/view/ivug-details-view.c @@ -442,6 +442,16 @@ ivug_details_view_destroy(Ivug_DetailsView *pDetailsView) MSG_DETAIL_HIGH("Removing Details VIew"); // Layout removed automatically when popping from navi item. + if (pDetailsView->genlist) { + elm_genlist_clear(pDetailsView->genlist); + pDetailsView->genlist = NULL; + } + if(pDetailsView->bg) + { + evas_object_del(pDetailsView->bg); + pDetailsView->bg = NULL; + } + if(pDetailsView->layout) { evas_object_del(pDetailsView->layout); @@ -455,12 +465,21 @@ ivug_details_view_destroy(Ivug_DetailsView *pDetailsView) void ivug_details_view_update(Ivug_DetailsView *pDetailsView, const char *new_path) { + MSG_IVUG_HIGH("ivug_details_view_update"); + free(*(pDetailsView->filename)); *(pDetailsView->filename) = ecore_file_strip_ext(ecore_file_file_get(new_path)); free(*(pDetailsView->path)); *(pDetailsView->path) = strdup(new_path); - - elm_genlist_realized_items_update(pDetailsView->genlist); + //elm_genlist_realized_items_update(pDetailsView->genlist); + Elm_Object_Item *item = NULL; + if (pDetailsView->genlist) { + item = elm_genlist_first_item_get(pDetailsView->genlist); + while (item) { + elm_genlist_item_update(item); + item = elm_genlist_item_next_get(item); + } + } } diff --git a/main/src/view/ivug-main-view-toolbar.cpp b/main/src/view/ivug-main-view-toolbar.cpp index f587967..77c5d84 100755 --- a/main/src/view/ivug-main-view-toolbar.cpp +++ b/main/src/view/ivug-main-view-toolbar.cpp @@ -20,21 +20,6 @@ #include "ivug-slider.h" -#define CONTROL_ICON_DIRECTORY_PATH IMAGE_PATH"/01_Control icon" - -#define ICON_PATH_DELETE CONTROL_ICON_DIRECTORY_PATH"/T01_controlbar_icon_delete.png" -#define ICON_PATH_SHARE CONTROL_ICON_DIRECTORY_PATH"/T01_controlbar_icon_share.png" -#define ICON_PATH_SETAS CONTROL_ICON_DIRECTORY_PATH"/T01_1_title_icon_set_as.png" -#define ICON_PATH_ADDTAG CONTROL_ICON_DIRECTORY_PATH"/T01_controlbar_icon_addtag.png" -#define ICON_PATH_SLIDESHOW CONTROL_ICON_DIRECTORY_PATH"/T01_controlbar_icon_slideshow.png" -#define ICON_PATH_EDITOR CONTROL_ICON_DIRECTORY_PATH"/T01_Option tray_Edit.png" -#define ICON_PATH_TRIM CONTROL_ICON_DIRECTORY_PATH"/01_controlbar_icon_trim.png" -#define ICON_PATH_INFO CONTROL_ICON_DIRECTORY_PATH"/T01_1_controlbar_icon_detail.png" -#define ICON_PATH_SAVE CONTROL_ICON_DIRECTORY_PATH"/T01_controlbar_icon_save.png" -#define ICON_PATH_CLOSE CONTROL_ICON_DIRECTORY_PATH"/01_controllbar_icon_close.png" -#define ICON_PATH_MORE CONTROL_ICON_DIRECTORY_PATH"/T01_Title_icon_more.png" - - #define MIME_TYPE_LEN (255) #define MIME_TYPE_3GPP "video/3gpp" #define PATH_CAMERA_LOCAL "/opt/usr/media/Camera" diff --git a/main/src/view/ivug-main-view.cpp b/main/src/view/ivug-main-view.cpp index 83e6580..4b9ea37 100755 --- a/main/src/view/ivug-main-view.cpp +++ b/main/src/view/ivug-main-view.cpp @@ -1512,12 +1512,6 @@ ivug_main_view_destroy(Ivug_MainView *pMainView) pMainView->popup = NULL; } - if (pMainView->ss_music_name) - { - free(pMainView->ss_music_name); - pMainView->ss_music_name = NULL; - } - if (pMainView->ext_ug) { MSG_MAIN_HIGH("External UG Destroy"); diff --git a/main/src/view/ivug-name-view.c b/main/src/view/ivug-name-view.c index 7fce7d9..d47ae6a 100755 --- a/main/src/view/ivug-name-view.c +++ b/main/src/view/ivug-name-view.c @@ -25,11 +25,6 @@ #include "ivug-util.h" -#define CONTROL_ICON_DIRECTORY_PATH IMAGE_PATH"/01_Control icon" - -#define ICON_PATH_SAVE CONTROL_ICON_DIRECTORY_PATH"/T01_controlbar_icon_save.png" -#define ICON_PATH_CLOSE CONTROL_ICON_DIRECTORY_PATH"/01_controllbar_icon_close.png" - static void _on_timeout_response(void *data, Evas_Object *obj, void *event_info) { diff --git a/main/src/view/ivug-setas-view-callerid.cpp b/main/src/view/ivug-setas-view-callerid.cpp index b329e66..89a9c87 100755 --- a/main/src/view/ivug-setas-view-callerid.cpp +++ b/main/src/view/ivug-setas-view-callerid.cpp @@ -42,19 +42,12 @@ #define SETAS_INTERVAL_TIME 0.1 #define SETAS_INTERVAL_TIME_FIRST_LOAD 0.3 -#define POPUP_ICON_DIRECTORY_PATH IMAGE_PATH"/Popup_icon" -#define ICON_PATH_ROTATE_LEFT POPUP_ICON_DIRECTORY_PATH"/T01_1_popup_icon_Rotate left.png" -#define ICON_PATH_ROTATE_RIGHT POPUP_ICON_DIRECTORY_PATH"/T01_1_popup_icon_Rotate right.png" - -#define CONTROL_ICON_DIRECTORY_PATH IMAGE_PATH"/01_Control icon" -#define ICON_PATH_SAVE CONTROL_ICON_DIRECTORY_PATH"/T01_controlbar_icon_save.png" -#define ICON_PATH_PREV CONTROL_ICON_DIRECTORY_PATH"/00_winset_btn_prev.png" - #define CROP_BOX_INTERVAL_TIME 0.3 typedef struct { Evas_Object *layout; Evas_Object *notify; + Evas_Object *notify_area; Evas_Object *photocam; Evas_Object *contents_area; @@ -243,7 +236,10 @@ _on_photocam_loaded(void *data, Evas_Object *obj, void *event_info) evas_object_smart_callback_call(pSetAsData->layout, "loaded", NULL); - pSetAsData->notify = ivug_notify_static_create(pSetAsData->contents_area, IDS_CALLER_ID_NOTIFY, NOTIFY_ALIGN_BOTTOM); + pSetAsData->notify_area = const_cast(edje_object_part_object_get(_EDJ(pSetAsData->layout), + "setasview.contents.swallow.notify")); + + pSetAsData->notify = ivug_notify_static_create(pSetAsData->notify_area, IDS_CALLER_ID_NOTIFY, NOTIFY_ALIGN_BOTTOM); int x, y, w, h; ivug_image_region_get(pSetAsData->photocam, &x, &y, &w, &h); @@ -454,7 +450,7 @@ Evas_Object *_ivug_setas_callerid_create_layout(Evas_Object *parent) MSG_SETAS_ERROR("Cannot create contets_area."); } - elm_object_part_content_set(pSetAsData->layout, "setasview.contents", pSetAsData->contents_area); + elm_object_part_content_set(pSetAsData->layout, "setasview.contents.swallow", pSetAsData->contents_area); evas_object_data_set(pSetAsData->layout, "pSetAsData", pSetAsData); evas_object_event_callback_add(pSetAsData->layout, EVAS_CALLBACK_MOVE, _on_moved, pSetAsData->layout); diff --git a/main/src/view/ivug-setas-view-wallpaper.cpp b/main/src/view/ivug-setas-view-wallpaper.cpp index e00f52a..d793485 100755 --- a/main/src/view/ivug-setas-view-wallpaper.cpp +++ b/main/src/view/ivug-setas-view-wallpaper.cpp @@ -40,12 +40,6 @@ #define SETAS_INTERVAL_TIME 0.1 #define SETAS_INTERVAL_TIME_FIRST_LOAD 0.3 -#define CONTROL_ICON_DIRECTORY_PATH IMAGE_PATH"/01_Control icon" -#define ICON_PATH_ROTATE_LEFT CONTROL_ICON_DIRECTORY_PATH"/T01_1_controlbar_icon_Rotate left.png" -#define ICON_PATH_ROTATE_RIGHT CONTROL_ICON_DIRECTORY_PATH"/T01_1_controlbar_icon_Rotate right.png" -#define ICON_PATH_SAVE CONTROL_ICON_DIRECTORY_PATH"/T01_controlbar_icon_save.png" -#define ICON_PATH_PREV CONTROL_ICON_DIRECTORY_PATH"/00_winset_btn_prev.png" - typedef struct { Evas_Object *layout; Evas_Object *photocam; diff --git a/main/src/view/ivug-slideshow-view.cpp b/main/src/view/ivug-slideshow-view.cpp index f4e76e6..b45330a 100755 --- a/main/src/view/ivug-slideshow-view.cpp +++ b/main/src/view/ivug-slideshow-view.cpp @@ -93,6 +93,20 @@ static bool _destory_slideshow_and_ug(Ivug_SlideShowView *pSSView, return true; } +static Eina_Bool __stop_slideshow_cb(void *data) +{ + Ivug_SlideShowView *pSSView = (Ivug_SlideShowView *)data; + if (pSSView && (pSSView->ssHandle)) { + if(pSSView->homekey_idler) + { + ecore_idler_del(pSSView->homekey_idler); + pSSView->homekey_idler = NULL; + } + ivug_ss_stop(pSSView->ssHandle); + } + return ECORE_CALLBACK_CANCEL; +} + static Eina_Bool _on_key_down(void *user_data, int type, void *event) { if (!user_data) { @@ -112,7 +126,9 @@ static Eina_Bool _on_key_down(void *user_data, int type, void *event) { MSG_IMAGEVIEW_HIGH("Home key"); /*home key,we need to stop slideshow also*/ - ivug_ss_stop(pSSView->ssHandle); + if (pSSView->homekey_idler == NULL) { + pSSView->homekey_idler = ecore_idler_add(__stop_slideshow_cb, pSSView); + } } else if (!strcmp(key_event->keyname, KEY_POWER)) { @@ -446,6 +462,11 @@ ivug_slideshow_view_destroy(Ivug_SlideShowView *pSSView) ecore_event_handler_del(pSSView->keydown_handler); pSSView->keydown_handler = NULL; } + if(pSSView->homekey_idler) + { + ecore_idler_del(pSSView->homekey_idler); + pSSView->homekey_idler = NULL; + } if ( pSSView->mList ) { diff --git a/medialist/src/ivug-data-list.h b/medialist/src/ivug-data-list.h old mode 100644 new mode 100755 index 05e93bb..d2e765d --- a/medialist/src/ivug-data-list.h +++ b/medialist/src/ivug-data-list.h @@ -17,6 +17,7 @@ #ifndef __IVUG_DATA_LIST_H__ #define __IVUG_DATA_LIST_H__ +#include "ivug-define.h" #include "ivug-medialist.h" #ifdef __cplusplus -- 2.7.4