From 3ce29b6bd4b0f242a6ac1e59a3b1617862cd4754 Mon Sep 17 00:00:00 2001 From: Hyoyoung Chang Date: Wed, 6 Oct 2010 21:40:39 +0900 Subject: [PATCH] add close button --- CMakeLists.txt | 1 + data/images/clipboard_arrow_bar.png | Bin 0 -> 3577 bytes data/images/clipboard_close_arrow.png | Bin 0 -> 717 bytes data/images/clipboard_close_bg.png | Bin 0 -> 447 bytes data/images/clipboard_panel_bg.png | Bin 0 -> 2837 bytes data/images/clipboard_panel_list_bg.png | Bin 0 -> 3003 bytes data/themes/cbhmdrawer.edc | 85 +++++++++++++++++++++++++++++--- src/clipdrawer.c | 68 ++++++++++++++++--------- src/clipdrawer.h | 7 +++ src/xcnphandler.c | 12 ++++- 10 files changed, 141 insertions(+), 32 deletions(-) create mode 100755 data/images/clipboard_arrow_bar.png create mode 100644 data/images/clipboard_close_arrow.png create mode 100644 data/images/clipboard_close_bg.png create mode 100755 data/images/clipboard_panel_bg.png create mode 100755 data/images/clipboard_panel_list_bg.png diff --git a/CMakeLists.txt b/CMakeLists.txt index 0650b44..4d3ce5d 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,6 +29,7 @@ TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS}) ADD_CUSTOM_TARGET(cbhmdrawer.edj COMMAND edje_cc + -id ${CMAKE_CURRENT_SOURCE_DIR}/data/images ${CMAKE_SOURCE_DIR}/data/themes/cbhmdrawer.edc ${CMAKE_BINARY_DIR}/data/themes/cbhmdrawer.edj DEPENDS ${CMAKE_SOURCE_DIR}/data/themes/cbhmdrawer.edc ) diff --git a/data/images/clipboard_arrow_bar.png b/data/images/clipboard_arrow_bar.png new file mode 100755 index 0000000000000000000000000000000000000000..ff213e662f2cc677daf0f1b2b0f908ceb92f00e2 GIT binary patch literal 3577 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 literal 0 HcmV?d00001 diff --git a/data/images/clipboard_close_arrow.png b/data/images/clipboard_close_arrow.png new file mode 100644 index 0000000000000000000000000000000000000000..bcf7b1c7f53ae928ab756ae00410aab0c44bed01 GIT binary patch literal 717 zcmV;;0y6!HP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2igh- z3p+CCnuE;%000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}0006gNklX}$-(0@pwTxR!ZD`ajGpMx%s6 zp~qn+l}fRZOcGX<2Qw4=-GMqg%a*1Q4u?6mZEkLE#J(9tQOM`>q_?)1o0}8=fJ4C` znM{Vv_BPRl1@Y4)%QBj#kZ3;4;C#(qvE%=BuQwRMlP3Qd3pI>Eb<)|FW1-EDHM1Xk59~^;510O zy1Gi=acEv#h!0m^noUkC6~^PSxSR1jk59E4MzKh}UiUB0Osdgn#Oc`?x~|h|wfqfN zlV~^`VxOF#>pGoI$N!{vSGlgs;n5MLQi)!#H=Wpd7xf(n>)-&(vT$8@dKvg{>U6u5 zEQ@lv%9gp`%&+tvF4e`(x%P?k00000NkvXXu0mjfzZ*ow literal 0 HcmV?d00001 diff --git a/data/images/clipboard_close_bg.png b/data/images/clipboard_close_bg.png new file mode 100644 index 0000000000000000000000000000000000000000..4fc47fa92cb990ffb8ad75d9352939d2eb814d51 GIT binary patch literal 447 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 literal 0 HcmV?d00001 diff --git a/data/images/clipboard_panel_list_bg.png b/data/images/clipboard_panel_list_bg.png new file mode 100755 index 0000000000000000000000000000000000000000..8068680fd30f5c6a93d6368fa700f60aee893d09 GIT binary patch literal 3003 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 xP(T3%6i`3`1r$&~0Rpath); + fprintf(stderr, "## sel path = %s_\n", p); + elm_selection_set(/*secondary*/1,obj,/*ELM_SEL_FORMAT_IMAGE*/4,p); clipdrawer_lower_view(ad); @@ -139,19 +132,50 @@ void grid_del(const void *data, Evas_Object *obj) free(ti); } +// FIXME: how to remove main_ad? +// it's mainly used at 'clipdrawer_add_image_item' +int clipdrawer_add_image_item(char *imagepath) +{ +// struct appdata *ad = data; + gridimgitem_t *newgenimg = NULL; + char* filepath = NULL; + filepath = &imagepath[7]; // skip 'file://' + + fprintf(stderr, "## image_path = %s_\n", filepath); + newgenimg = malloc(sizeof(gridimgitem_t)); + newgenimg->path = eina_stringshare_add(filepath); + newgenimg->item = elm_gengrid_item_append(g_main_ad->imggrid, &gic, newgenimg, NULL, NULL); + + return TRUE; +} + +static void +clipdrawer_ly_clicked(void *data, Evas_Object *obj, const char *emission, const char *source) +{ + struct appdata *ad = data; + + if (!strncmp(source, "cbhmdrawer/closebtn_", 20)) + { + clipdrawer_lower_view(ad); + } +} + int clipdrawer_init(void *data) { struct appdata *ad = data; + g_main_ad = ad; + + evas_object_resize(ad->win_main, CLIPDRAWER_WIDTH, CLIPDRAWER_HEIGHT); + evas_object_move(ad->win_main, CLIPDRAWER_POS_X, CLIPDRAWER_POS_Y); + evas_object_resize(ad->ly_main, CLIPDRAWER_WIDTH, CLIPDRAWER_HEIGHT); + evas_object_move(ad->ly_main, CLIPDRAWER_POS_X, CLIPDRAWER_POS_Y); - evas_object_resize(ad->win_main, 480, 360); - evas_object_move(ad->win_main, 0, 440); - evas_object_resize(ad->ly_main, 480, 360); - evas_object_move(ad->ly_main, 0, 440); + edje_object_signal_callback_add(elm_layout_edje_get(ad->ly_main), "mouse,up,1", "*", clipdrawer_ly_clicked, ad); ad->imggrid = NULL; ad->imggrid = elm_gengrid_add(ad->win_main); elm_layout_content_set(ad->ly_main, "cbhmdrawer/imglist", ad->imggrid); - elm_gengrid_item_size_set(ad->imggrid, 125, 135); + elm_gengrid_item_size_set(ad->imggrid, 100, 100+3); elm_gengrid_align_set(ad->imggrid, 0.5, 0.0); elm_gengrid_horizontal_set(ad->imggrid, EINA_TRUE); elm_gengrid_bounce_set(ad->imggrid, EINA_TRUE, EINA_FALSE); @@ -161,8 +185,6 @@ int clipdrawer_init(void *data) elm_gengrid_clear(ad->imggrid); - // gic should live at gengrid callback functions - static Elm_Gengrid_Item_Class gic; gic.item_style = "default_grid"; gic.func.label_get = NULL; gic.func.icon_get = grid_icon_get; diff --git a/src/clipdrawer.h b/src/clipdrawer.h index 7c0be0e..9c909e8 100644 --- a/src/clipdrawer.h +++ b/src/clipdrawer.h @@ -1,6 +1,11 @@ #ifndef _clipdrawer_h_ #define _clipdrawer_h_ +#define CLIPDRAWER_POS_X 0 +#define CLIPDRAWER_POS_Y 465 +#define CLIPDRAWER_WIDTH 480 +#define CLIPDRAWER_HEIGHT 335 + /* view maintains */ int clipdrawer_init(void *data); int clipdrawer_create_view(void *data); @@ -11,4 +16,6 @@ void clipdrawer_lower_view(void *data); const char* clipdrawer_get_plain_string_from_escaped(char *escstr); int clipdrawer_update_contents(void *data); +int clipdrawer_add_image_item(char *imagepath); + #endif // _clipdrawer_h_ diff --git a/src/xcnphandler.c b/src/xcnphandler.c index f36cfb2..93cf049 100755 --- a/src/xcnphandler.c +++ b/src/xcnphandler.c @@ -209,7 +209,17 @@ int get_selection_content(void *data) unesc = clipdrawer_get_plain_string_from_escaped(cbbuf); // add_to_storage_buffer(ad, cbbuf, cbitems); // DTRACE("len = %ld, data = %s\n", cbitems, cbbuf); - add_to_storage_buffer(ad, unesc, strlen(unesc)); + +/* + if (!strncmp(unesc, "file://", 7) && + (strstr(unesc,".png") || strstr(unesc,".jpg"))) + { + fprintf(stderr, "## clipdrawer add path = %s\n", unesc); + clipdrawer_add_image_item(unesc); + } + else +*/ + add_to_storage_buffer(ad, unesc, strlen(unesc)); DTRACE("len = %ld, data = %s\n", strlen(unesc), unesc); free(unesc); -- 2.7.4