From ef58b5cd4acdfda8bf43b2ce9f5d82c8195e2208 Mon Sep 17 00:00:00 2001 From: "deasung.kim" Date: Thu, 12 Jan 2012 23:14:04 +0900 Subject: [PATCH] [C&P popup] add search button & change clipboard icon to text Change-Id: Iccaa363b55ae9156344727c6531943475db6873b --- data/images/Makefile.am | 6 +-- ...con_share.png => copy&paste_icon_clipboard.png} | Bin 3210 -> 3982 bytes ...on_clipboard.png => copy&paste_icon_search.png} | Bin 3528 -> 3700 bytes ...e_icon_search.png => copy&paste_icon_share.png} | Bin 3368 -> 3429 bytes debian/control | 2 +- packaging/elementary.spec | 1 + src/modules/ctxpopup_copypasteUI/Makefile.am | 2 +- src/modules/ctxpopup_copypasteUI/copypaste.c | 44 +++++++++++++++++---- 8 files changed, 42 insertions(+), 13 deletions(-) rename data/images/{copypaste_icon_share.png => copy&paste_icon_clipboard.png} (67%) rename data/images/{copypaste_icon_clipboard.png => copy&paste_icon_search.png} (72%) rename data/images/{copypaste_icon_search.png => copy&paste_icon_share.png} (78%) diff --git a/data/images/Makefile.am b/data/images/Makefile.am index 88a4f7e..fd11ba6 100644 --- a/data/images/Makefile.am +++ b/data/images/Makefile.am @@ -45,9 +45,9 @@ icon_22.png \ icon_23.png \ bubble.png \ bubble_sh.png \ -copypaste_icon_clipboard.png \ -copypaste_icon_search.png \ -copypaste_icon_share.png \ +copy&paste_icon_clipboard.png \ +copy&paste_icon_search.png \ +copy&paste_icon_share.png \ mystrale.jpg \ mystrale_2.jpg \ twofish.jpg \ diff --git a/data/images/copypaste_icon_share.png b/data/images/copy&paste_icon_clipboard.png similarity index 67% rename from data/images/copypaste_icon_share.png rename to data/images/copy&paste_icon_clipboard.png index b83a7d2be307d63ec2e6309b14930a66ba9cea9d..0158875550534928a08376b3e432724b6530cf49 100644 GIT binary patch delta 1283 zcmV+e1^oJo8IB(ziBL{Q4GJ0x0000DNk~Le0000w0000w2nGNE0O7kzD6t`)3V#H- zNkl$fQ#45AebW)jCYPH&IR-G|cd$rlv zn^tGD7o|3>u}N(@sZOSo>9xqHO+#&V38lnBD6v?$MEYXi%hTgL|JvuddD`B?75A6t z`Q6|5Ip=%M_ndn-tgWr_FxVqJB!AWc+5vi>+M{-%*=&~Wj1^!I*aY+fE5HKK0P0aU z1wjxGv_!TKcmo&)f{1GtfRn)Iz-ruP8*F(gfky{`Q^1Z4_gn||0`pNGEfYt(fRBJ* zGlB%z2FxhDOYPALFabR4{BIigL3~^UYCyk2ddyr~2lfD~)}v(rx)GSv;eYL+j{{d@ z?i~Tn0@cvkLEwDZLU*%5H4Ji90EZGlB2OPSYj2e;bhiSR4X;+@k&7AkngMo(9@OJO z5G<9!qdVovFvw+P&Wm@k-?t{I^_M{z4Fgk3D&cy#J5B&3*t~h)lc%+uJQ$=Z#yS$9HOv&hhT(cxq_@LlKu ztN>2{OEG&@fq!&wOJM9yBkFq#2Du=Rf0*?ea4A$KkeKgE*zdg%NTRZ~2Xs?`Aa6>d z%{d&KRBa90+rX`u{rUtn94Y700xim}1JB8$R*+vZ38e`fG4&BA%zwWzE!-zwB5Ehl zI`ERiwE^XWn(@khm7%y!XWVo-bHJzTIZF9nif74btS>vlVNU|cZh_oqBH(rXT^FFI zrCnFd`fI=ilSFPv9mNUxnz%e_%E`ebRaGR=4}qi3h~op`OOs7!fn83L@;aSCvwl=v zOt#@z4z{WfKjZM~3xB7Ls;k^ACrl6~O+{#`MLVD7PioanyCOH_G67q~{ zvgPlLKCjTwozwWks+K7u1fuwB?SxT0C>!r}l+reNeWS_Zg?|7&Zjwo_o^VgbF-f3| z{EAus5qQ}tQ-e}fm3DCSFO%N86mnsZwRWlZPvL&VR4+(z>6S#M5e`8i;0>?`q*CsttRzkD;^g1g z4&Srd(=BmQa*2Wv)Rb|%$DXtw;HtwTf^FntE@OMu8&ud)r zn_d-_jaaSH#Qizrd9o!~(*9T@{8jn=Vs(iQvT*be$v>1RlTGW)nL^h}u%42GTyz9S ta_By&*7?0|2WSUq2WSUq2WSCydjN`&Qw_~nqPYM7002ovPDHLkV1mI=Y{LKm delta 505 zcmVZA2X6kkifgV$Pnk^E^FY?HtaBhsXEF=lk~gyua_y=i5=ORyC7# zYBFmBYB@k%^(HEnN(}##*v2}J(|;BuNpi0d8pUHA;Au0ZtOwt)(o7sGVHa=i#GwK< zgeU06T*~~bux1s15w)Y9Qs*RfDWu~i#xm~tg=a~UT*Xe=JWla32N;3u8!=NhgfDnl zz{hngKx6oU;R0axu@&Q%JqoIdMMFoS+9)$#Ej&tpVrG(@H+W$qJRSUU6$<0&bc!C`~F7nsekE;ENlQe^)o@ZevE9OEmdvVh40 z=o~vWW1INdVBhZm`YdZ2@+$R%Ab@2|hbR@Y+V&$>>4*lXrCQiQtQ9N`wX*Rd)V|VP zuKjj!P)2VAKnwUB{-;B=&rTJgzCXIXSP|05XUjf=1|yu6sWZr0I!=N(7U`!aVgecn v-+xWnepteL0z8zD_dk8K7WgKC#!sK*vjl7cS$XjWv4DP{C4azgoRsfI z^3kxMp3G#Y<|`Rs0=Oq|rPKtBNtD*<1#muY&?mrU&EpI5LTd(=)egMUq#}S}8NgUT zdx3YFM<;-*KrVtC)c|ib*0Kd02GXw6OEqxE2XZ(fBx35_zz@Z}BrqCBFggc3*ChIG z3y?ci2mA!;i>~K@qf%8ln}5-ps&NpXv%Rct)#|xt%Lsc>3<8wp@x9w92s;| z^TVw%fvWyz)m3^?MZVq`AQPIL`O6jPf@b}gatu1Ci3RhnK&Lg4Z_FX22i(y3=b|gn zRn+~~L5IFNq_LPO)2JJCJ=!m;f7KuyCs=(f3bV}ujX{eQ)Ai_#CJ3Z}H`r@S z*2{n|bURZd`6Kr5gX&|RT_0{|$3 V8h|ohJvaaW002ovPDHLkV1mCi(g^?n delta 826 zcmV-A1I7IG9LO6XiBL{Q4GJ0x0000DNk~Le0000a0000a2nGNE0O0_bn6V+A3V#Cg zNklBavaMT%Q40=);~uXr8K52muQxVQZ}V*N@JR3jHN$Dq(5?L zqH~ehG@~?4)0D;$(-bjAL_~~n9OwGy`{UW`Zry&rJ5Kie^WOV=pP%>pe&6T$KF{y! z3WWl-WV@&_t2scsy&t(;u3CFE0)JgV3$zu1t#R104`RO zp>bUkz!Go)SS#WCRM+_t=%@xmNdx9JaC{3e05clfi)L9sYXz2pYYNh53V+?P*A)UD1D8#@yS87_0Pwt2>4+2&uyX7k&?hhv;H3dG2@E*?4Z4Ytu6L%AwQLX= zHYMV%Ir$y2X5*(Gcm>3DfPVouzWiocPONxzHv@09Q69LV(qJtrz;Vs{q*Vk3v;mv} z<~48AMlC=VxCBf)?^qxAFo6JNC3qRl4~m&a)v0bbYk;FFC5<{vH?Uw5DHkM$h76bl z@Ln7J0y>I-=@B#5XTbnX25HciOk5;%>Ikr^qPgPu_XAUo&$0tF8h-@PLz7Ku(VYQ~ zNR4qsF{#wf2#n`*)c_6D!p@n~HA(VMIGvv-ilgS8PE)tWwI2Fs3tNV*Yi!cEW}bNg znl@^m0LJ z=*8PRvsO_+Ba;5SI)A}c&3n}k<#a_8hS3keVPBs?Wj0}Bs$JiJ18P;;fuCY-#R%q< zl$mM)0=T7^7?$cz7V+r^9_UH~eYuv~jtc>?!z!Q^o ztv>gkcOST)LG_~C?*`iiGwps#*X{frvjgaV1N3(QT=Kilg%8B&(*OVf07*qoM6N<$ Eg3|MNwEzGB diff --git a/data/images/copypaste_icon_search.png b/data/images/copy&paste_icon_share.png similarity index 78% rename from data/images/copypaste_icon_search.png rename to data/images/copy&paste_icon_share.png index bc8e48cff8411d63c420586d3dbd5c599054dcb2..7d78c6927aad236e35b416771fc010b2484693d7 100644 GIT binary patch delta 725 zcmV;`0xJEe8s!=xiBL{Q4GJ0x0000DNk~Le0000w0000w2nGNE0O7kzD6t`*3V)DE zL_t(|+U%K4XcIvc$A7hDpb!w^MJNd@Vo?MIsYkCC zyjTQ5!HXxwpiqSNR1gb2l@^79Ae0^gfrYXj@`9mCcJ^atQ}_L02}yRc^P72J^D+>I zAw|$J3L*tnPz6;`1@);R+Z%%*@P9qGI&cGc0<72$GR7Ra9jybGfR8}!e>Ppy_4)!> zEQ*gl5MWb;U{nL%1EnHF-72sOj20oiR0OtSJ7B=}nC39O49YH5fif^ArdhG@$0l$c zXhfx#yg&_bOY-D}BtF+YHQ+X|+zWKbv&kI?=777v$qW~*6OEtugXz|Qr+;FeF4O`} z7-L#_1*0+GldO8#;d6$2S&3`Yy#~BW>4Uav06Tf4mxsVRPmrG_`r>;>p8;KX(U?QPU8Y$^w?V_tL;2vQbLTHY#ZMqq04CYaUfl1yxW5RZs=}OTPyIhAW!rR?yIZ00000NkvXX Hu0mjf>D4~2 delta 663 zcmV;I0%-l^8mJl}iBL{Q4GJ0x0000DNk~Le0000a0000a2nGNE0O0_bn6V+B3V%~c zL_t(|+U(e0WR+nY2k_6@9Ab=!!x&49jVuvS+RZL9x{5NQl;|#9OkHIcsheG-)K%J5 z8j(h%#HNUpqMKsG7!eU84zq5a!{hOubKXC*or}J_7w_|)=Q-c!`};n>-|u~UHa9nQ z6L#q`bRD6-bfD2_#w8h?J4B~q)^vI%v-AzZ>q)H9xc#WUQ&?=r-CQd753 zsE#>I=UjIkx5KqjM4>!{4&!+XMLOX%&g4<6NvM;l$FY=<`GXr6Lr=K+Z~_mL`IC5s z-CGf|z4(m5=9yF8N6KdESl-9@RWjc#BqwaD451oE6C;q4A{nmO5o| zQk$+oW+d6ra#=zP$)aaV5`UUa!nIhI&>}uX_jd!aBDfq%Mick&w@M3pCF*4cLeqtt|zBuDg4n;n@YcgTN%&xY*oiNhpQQLzlX4{2ZG}r65k3YT6GIW zIz~7beAHjSLo1;t>P@otu`E(~J4R9au@4V&WbW1Azp>Di#Xa>f-fXr@ws{pwOUq>F zwd=|5m+?ON{V6=jP--HslSM;T6&*8MiZvaR-t9ivDWKRG9002ovPDHLkV1l*qJca-O diff --git a/debian/control b/debian/control index 49f6966..0bc2ca2 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: x11 Priority: optional Maintainer: Jaehwan Kim , Chuneon Park , Juyung Seo , Myungjae Lee , Woohyun Jung , Jihoon Kim , Jeonghyun Yun , Seunggyun Kim , Shinwoo Kim Uploaders: Doyoun Kang , Hyoyoung Chang , Myoungwoon Kim , Shinwoo Kim , Tae-Hwan Kim -Build-Depends: debhelper (>= 6), cdbs, libecore-dev, libevas-dev, libeet-dev, libeet-bin, libedje-dev, pkg-config, libtool, libeina-dev, libefreet-dev, libethumb-dev +Build-Depends: debhelper (>= 6), cdbs, libecore-dev, libevas-dev, libeet-dev, libeet-bin, libedje-dev, pkg-config, libtool, libeina-dev, libefreet-dev, libethumb-dev, libappsvc-dev Standards-Version: 3.8.1 Homepage: http://www.enlightenment.org diff --git a/packaging/elementary.spec b/packaging/elementary.spec index 22e53f2..b87fc82 100644 --- a/packaging/elementary.spec +++ b/packaging/elementary.spec @@ -24,6 +24,7 @@ BuildRequires: pkgconfig(evas) BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(icu-i18n) +BuildRequires: pkgconfig(appsvc) BuildRequires: edje-tools BuildRequires: embryo BuildRequires: eet-tools diff --git a/src/modules/ctxpopup_copypasteUI/Makefile.am b/src/modules/ctxpopup_copypasteUI/Makefile.am index 3f31a04..a3e5dc8 100755 --- a/src/modules/ctxpopup_copypasteUI/Makefile.am +++ b/src/modules/ctxpopup_copypasteUI/Makefile.am @@ -29,5 +29,5 @@ pkg_LTLIBRARIES = module.la module_la_SOURCES = copypaste.c module_la_LIBADD = $(top_builddir)/src/lib/libelementary.la -module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version +module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version -lappsvc module_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/src/modules/ctxpopup_copypasteUI/copypaste.c b/src/modules/ctxpopup_copypasteUI/copypaste.c index a08253b..d35e4ca 100644 --- a/src/modules/ctxpopup_copypasteUI/copypaste.c +++ b/src/modules/ctxpopup_copypasteUI/copypaste.c @@ -1,6 +1,7 @@ #include #include "elm_module_priv.h" #include "elm_priv.h" +#include Elm_Entry_Extension_data *ext_mod; static int _mod_hook_count = 0; @@ -155,6 +156,31 @@ _cancel(void *data, Evas_Object *obj, void *event_info) } static void +_search_menu(void *data, Evas_Object *obj, void *event_info) +{ + if(!ext_mod) return; + + int ret; + bundle *b = bundle_create(); + if (!b) + { + //printf("bundle_create() failed\n"); + return; + } + + appsvc_set_operation(b, APPSVC_OPERATION_SEARCH); + if (ext_mod->selmode) + { + char *selection = elm_entry_selection_get(ext_mod->caller); + if (selection) + appsvc_add_data(b, APPSVC_DATA_KEYWORD, selection); + } + appsvc_run_service(b, 0, NULL, NULL); + bundle_free(b); + _ctxpopup_hide(obj); +} + +static void _clipboard_menu(void *data, Evas_Object *obj, void *event_info) { if(!ext_mod) return; @@ -299,13 +325,14 @@ obj_longpress(Evas_Object *obj) if ((!ext_mod->password) && (ext_mod->editable)) #endif { - icon = elm_icon_add(ext_mod->popup); - snprintf(buf, sizeof(buf), "%s/images/copypaste_icon_clipboard.png", PACKAGE_DATA_DIR); - elm_icon_file_set(icon, buf, NULL); - added_item = elm_ctxpopup_item_append(ext_mod->popup, NULL, icon, _clipboard_menu, obj); + added_item = elm_ctxpopup_item_append(ext_mod->popup, "Clipboard", NULL, _clipboard_menu, obj); // Clipboard //elm_ctxpopup_item_append(ext_mod->popup, "More", NULL, _clipboard_menu, obj ); } // end for cbhm + icon = elm_icon_add(ext_mod->popup); + snprintf(buf, sizeof(buf), "%s/images/copy&paste_icon_search.png", PACKAGE_DATA_DIR); + elm_icon_file_set(icon, buf, NULL); + added_item = elm_ctxpopup_item_append(ext_mod->popup, NULL, icon, _search_menu, obj); // Search } else { @@ -348,13 +375,14 @@ obj_longpress(Evas_Object *obj) if (ext_mod->editable) #endif { - icon = elm_icon_add(ext_mod->popup); - snprintf(buf, sizeof(buf), "%s/images/copypaste_icon_clipboard.png", PACKAGE_DATA_DIR); - elm_icon_file_set(icon, buf, NULL); - added_item = elm_ctxpopup_item_append(ext_mod->popup, NULL, icon, _clipboard_menu, obj); + added_item = elm_ctxpopup_item_append(ext_mod->popup, "Clipboard", NULL, _clipboard_menu, obj); // Clipboard //elm_ctxpopup_item_append(ext_mod->popup, "More", NULL, _clipboard_menu, obj ); } // end for cbhm + icon = elm_icon_add(ext_mod->popup); + snprintf(buf, sizeof(buf), "%s/images/copy&paste_icon_search.png", PACKAGE_DATA_DIR); + elm_icon_file_set(icon, buf, NULL); + added_item = elm_ctxpopup_item_append(ext_mod->popup, NULL, icon, _search_menu, obj); // Search } } EINA_LIST_FOREACH(ext_mod->items, l, it) -- 2.7.4