From 7f898d8daf9de254c0d5dbc2da02fb50f63c90d1 Mon Sep 17 00:00:00 2001 From: Jaime Thomas Date: Mon, 15 Sep 2008 13:31:30 +0000 Subject: [PATCH] More work on the buttons --- .../trunk/data/themes/default/images/audio.png | Bin 0 -> 1116 bytes .../trunk/data/themes/default/images/clear.png | Bin 0 -> 1682 bytes .../data/themes/default/images/drive_optical.png | Bin 0 -> 1338 bytes .../trunk/data/themes/default/images/images.edc | 4 ++++ .../trunk/data/themes/default/images/iso.png | Bin 0 -> 1971 bytes experimental/ecdb/trunk/src/ecdb_gui.c | 2 +- experimental/ecdb/trunk/src/ecdb_misc.c | 14 ++++++++++++++ experimental/ecdb/trunk/src/ecdb_misc.h | 2 ++ 8 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 experimental/ecdb/trunk/data/themes/default/images/audio.png create mode 100644 experimental/ecdb/trunk/data/themes/default/images/clear.png create mode 100644 experimental/ecdb/trunk/data/themes/default/images/drive_optical.png create mode 100644 experimental/ecdb/trunk/data/themes/default/images/iso.png diff --git a/experimental/ecdb/trunk/data/themes/default/images/audio.png b/experimental/ecdb/trunk/data/themes/default/images/audio.png new file mode 100644 index 0000000000000000000000000000000000000000..0e68ace0dc864c40b5e991a92d9c586935fbf81a GIT binary patch literal 1116 zcmV-i1f%?1%@qF6F7)2uCaLI_OFbt^~QB_6^6_K#S zxo;-ctyMR`@xe5OLY@1O{PSsEcjy-=s z4FXRk^1;~JU1UtabqIxmg}iAYm$ORqb4B&(BN@>&0Kp{$mvCGMOJ)gXz63L8Ik#?= z?0l}EdVaYa3h^s`KoWPk25XANh1{ zzS{rzV7j>goGTy@zBoOr*Ar9oe; zuB_hgx?-9Izc;^X_{cScP^gX zp=-N3j31ske5|dzJ0omo0hYahLg@xP--3)t>`d+h1st3)7t3!D+6aK1e7p6uCL<>w zJ=m{x?%u<6T}R28hv${Rxr8Q@)&7Zx`t@fsnFm_hJ6god!f!}MyC9V)0Kj&$NG0xv z!VP@&_2(9WJ^`QraBBj*_HOHkJ>7dxJUMVgx13oN?Y}UayMd+RbpXrzxT|ddi`fNm z&K3Y9tfDWb|Cs^{4j~rqfaNSABviDe`r)~RtAAe#zWim_F_+A<=SJq=#~rV*H2~!@ zP91vuDRn+O1~4FQbV8MJ=;}5|C5~jY2Uo65(6^(b)}@QZ4*f!?GvY3zw7Jkd*tB<4{Gsf0-T3n z+a=`ki$$8yI(gOpeqyY66SwCFRn!OIRcX2E zyOKCS4Y_lkhAOI5*`i7r)($UP=|Giwl~%hI`#&evMgv_`0q`oV_Ft)frRo)cnw8cI ia5vx0&*3e(i~I}Vu86^AHgbCa0000=WF&{CV_9@n0EH~>m$0VH$B=#W-b8Il^pX+x7^ugKXTx^D5^$D zMUAwuzHwpT!~Ry#e=`>Vv2b7*rdN&zvAD{3@TrT)(J|^9*E1;?j4U?T}A}A5d;j1y_L4G z|MJo|&zdjHDd4R>f}d$JgbDxo)lC~)t*KBS+2|0Zi z(FWtElcAAw7fv41N*1p}Q!>cG0TxtM*_;mH2k-vY{`}uNFgrW1#Lu>b=}!K9J2e)I zrN8C&jczkDPC6dKRv}_5nP5S~dL=UQ4~vmbF1ceD!*c=v_~nC^2dob3OE=%Tu*hB- z#67Qu`W3A}8LzZ|U%7BNmQYo*eINW`P5`~HurwnJ$BVq)%7&F+z+1756R-C0#-5|p zIg40eh#Uz7WDRQfLv*$PX}Xg=9em3$#Ag=XbfaFm=r)3VVfOES4Jl#L-m)66DB|<^ zaD>BRTGv~EKhG90Z34#*uu(KPA_&#S`yHBn z>R|>9N_kA1^{5-S2J-#RYB8abafIzNMdL?vZ*vmR>#yc6nX2J9C@2;qDQD- z{kW&d-SE!wm-*r~0}O!=(}_q{)9j>@2@o=*6G2MKi-`n+xIA8xF%5(W?uuq6hK~{t zbyBx-x2vRj^9#KPc(Jz==d1w&{3|1ebwluwk`ow)LLxejMN%j#aT6Z(;qp`?M^c#D zC}lNkiTeJ@*x-H^-t>T@`qpo@idyl=@ea1m3UJ2|16ocNG&My|wV~vaC`yiGJW6R* z9f=7UiOe%Vjd5c#ej|r%m zFfPv;iYu0*XXCk`ufJo{Lp<5vj}veLHbA(V1gwCqyBGhq&FNj9$_BS#cu|$hSRHl9 z69F6^4^B@lp~2IXRX5=9G!q@YOe%g}30-tG3-!#G71UZu_0RR9107*qoM6N<$f|8{*)Bpeg literal 0 HcmV?d00001 diff --git a/experimental/ecdb/trunk/data/themes/default/images/drive_optical.png b/experimental/ecdb/trunk/data/themes/default/images/drive_optical.png new file mode 100644 index 0000000000000000000000000000000000000000..bf2e8c89fbc45b0d26a699b5a26b1542c4ac8575 GIT binary patch literal 1338 zcmV-A1;zS_P)NklcKUl?@n(abr|IY)Qy75uM%St86hH#c`A8jb#_l$rse|1d@q__e$}yUn_Mo3VHgXGi;J2M@aWN_bJNq)DIo;SX0z+^ht0zRd-q5w ziO1uNkB@(_y1IHk*n%r(&z|+O4?5@uBJBQ7)v#@w)2C0P>-x1Iz?pP9O}$?4D*J9* z5mt>>tHrTn$52Y0gSUIZkw_%M(W6J->uuNRnNBY)+qMDvf&ijctFf}OvMZC|1h&)1WGA-dwYq;@FhDMs({Rt8XEHLUShDb z3?rT~7K;&$MoFjB+_`fHr4)u?plKS8;}DC*FbsosyUqIgI;B#HVzEfMTt-TXX_|Nk z8OyS0wOW+RWmZ;J=hYin!2-M@eT*Nu&hEjO?Q zRDn9s4nQdA@W*72G$0O`0l)}5D@b?0SMDX<04<>50#w|PyKrkN=j13{7l$sh8kRr(E5NL&1 z>!1#!rDOlGGqnS){h%GE){$|>KiZj6XZnZJPIa)3EiIJ}(L#$lXqBKHAfN#Qq>Cn- z&Ayl2_ujp?e}sKa0!SU{^vs-j_v_vB+jGu6cOU$pMOFv+#AIiFq4h=gm^qo0he(dDAnKv}nMC^z~ z(Np9LKIv4PWTLG6z5b!=v%P7w7n6c*34cds7n=9Ua))@1PNF=hvvaAV^ z!+xC6Yi?xu;&uiG^8{)v7s{fNXJ34oFH|1G7!$5nN-5v>pLbpN-aUKv6ek1N<2zbg zr=<@5p|$?mrcIlcc6N3mr3^PT#*lZ5+_vRuqy#U}Xl)o7^{GjxkanD%J9lD?8L!qe z&pdNycX#(2z!M(}Q1tcb`Ar{;h(R%b#flaD;gue~`Q%F%xy`mELI^xxp|wF9Lo8z9 z6g*~cd}_klFMY9@hq_kN-QE2Fumdm?_8Q;G?0e*2(Q7t*b=mE=r!C8(V|ESSzkd-= zzu3dlg`cIoEQ%!swj~jO=WDbvXl*b8wryFBlmcVm^~3LTZs0uM`0`v*sT6H(ZOuZ6 zrMq_R+ILxi3v&OeRjbJ7^Z35c%8o`dgD$%d{*&8oX(N*z#VrIF491Lw#VrQB@YfT# z#enwa8UnAtk)wV5{98-WD!_3ZmM>qKJC_@qt9kXUV@$0oM;SvlUu57Thxg77bLM=WY`#cSZHh7*{{H4M9(!;x=~Nsk zC8MLGG&eU>QBkpe-MV!(mjw_)Jg{-&M&Y_{sgKqgr4$d}-NCd}j91?}K{{DRcBDwo z^-y{&q_x!*%)G9WeFxv++jqA!^SVlmF$f_r#^C!t%a$#RMk0~Tmjqa{WQi?=xUapv zoqRrzZQB@QP)ZR50V?qM!RGly@j2OdhMQ(jBN`biq?L&%H?`F8^1*lLTrh)PE z!qX$A#C2UdIywNhY~Q|JUIdU%r`If6w5T=`iBKpMkWvx^0iNekEEXvii)a<_=mR&C z%MNpP;3MYGo<_VZ!mV@bdF}09>Z@biaqEn5z2|uZL4a-Bc%DZxnPkqKIWrF*KD^>0 z03pQJR<2x0E|&u!2m*{T;U>lywAMr{!;dz%bNu9K2D3TV-ZGQk_s@~b4)b7VGoI(+ z`#!$!69fTLN|aJ)t#MtK#fukXS=N>b0PEJRtF5lCUe(ahfa5qQrO4;=0F;-Phs8)K zg;I*ja>)I7TwnnTagQ*8Z8 z8&j(iM59sS@i@t3l4LT8=Xp4egOm~}C6P!3r4$PnF0{4Q_rrxcAcVNPy}cdRb*Zhb zC7aDMGBSb?f*=UOwq;o)lSyFg{NJ2T^ShrkP*H9pr9^9u)_N>ov<}~qQj$ugsIIQ2 zzrUZ3jt=(j-Fpx4<5D5|Ofs2dWMqW1XV0RwM#{1Duq-PysI?CBq12Dr;QRgr&&6Uf zg!s=rXN)1A&*L}_T5G0EnS$2(hR_2*%=0{K+YVnGe*u-AC8*2IkDn{)__!Lx;nJhw6?b5c^)k-Effj`nwy((9EYZ+ zCUUtPsZ^?T)QKKi3?iBCBB+Ir34qW0OT(K@o!k3U4Q?i+IRo}002ovPDHLk FV1jL*$BzI2 literal 0 HcmV?d00001 diff --git a/experimental/ecdb/trunk/src/ecdb_gui.c b/experimental/ecdb/trunk/src/ecdb_gui.c index 866c77a3..a01a223e 100644 --- a/experimental/ecdb/trunk/src/ecdb_gui.c +++ b/experimental/ecdb/trunk/src/ecdb_gui.c @@ -241,7 +241,7 @@ ecdb_set_main_theme(const char *theme_name, const char *group) "/themes/default.edj", group)) { printf("Error setting default theme: %s\n", - PACKAGE_DATA_DIR"/themes/default/edj"); + PACKAGE_DATA_DIR"/themes/default.edj"); return; } evas_font_path_append(ecore_evas_get(em->main_win_ee), diff --git a/experimental/ecdb/trunk/src/ecdb_misc.c b/experimental/ecdb/trunk/src/ecdb_misc.c index 7407446e..3fbae40f 100644 --- a/experimental/ecdb/trunk/src/ecdb_misc.c +++ b/experimental/ecdb/trunk/src/ecdb_misc.c @@ -123,3 +123,17 @@ ecdb_strip_next_argument(const char *strip) return NULL; } +void +ecdb_button_icon_swallow(Evas *e, Evas_Object *b, const char *iname) +{ + Evas_Object *icon; + + icon = evas_object_image_add(e); + + /* FIXME WRONG HERE */ + evas_object_image_file_set(icon, PACKAGE_DATA_DIR"/themes/default.edj", + iname); + edje_object_part_swallow(b, "icon", icon); +} + + diff --git a/experimental/ecdb/trunk/src/ecdb_misc.h b/experimental/ecdb/trunk/src/ecdb_misc.h index 06537ab0..eb9e9ee6 100644 --- a/experimental/ecdb/trunk/src/ecdb_misc.h +++ b/experimental/ecdb/trunk/src/ecdb_misc.h @@ -13,4 +13,6 @@ int ecdb_image_init(void); /* This is misc after all */ int ecdb_match_keyword(const char *chk, const char *key, int len); char *ecdb_strip_next_argument(const char *strip); +void ecdb_button_icon_swallow(Evas *e, Evas_Object *b, + const char *iname); #endif