From 1a5b751be6834ba3270405506100121dea1e28e5 Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Sun, 21 May 2006 15:10:20 +0000 Subject: [PATCH] make radio icons use icons only to save space SVN revision: 22811 --- data/themes/default_icons.edc | 236 +++++++++++++++++- data/themes/default_radio.edc | 37 ++- data/themes/images/Makefile.am | 15 +- data/themes/images/e17_shelf_bottom.png | Bin 0 -> 597 bytes data/themes/images/e17_shelf_bottom_left.png | Bin 0 -> 589 bytes data/themes/images/e17_shelf_bottom_right.png | Bin 0 -> 574 bytes data/themes/images/e17_shelf_left.png | Bin 0 -> 587 bytes data/themes/images/e17_shelf_left_bottom.png | Bin 0 -> 592 bytes data/themes/images/e17_shelf_left_top.png | Bin 0 -> 585 bytes data/themes/images/e17_shelf_right.png | Bin 0 -> 588 bytes data/themes/images/e17_shelf_right_bottom.png | Bin 0 -> 586 bytes data/themes/images/e17_shelf_right_top.png | Bin 0 -> 623 bytes data/themes/images/e17_shelf_top.png | Bin 0 -> 591 bytes data/themes/images/e17_shelf_top_left.png | Bin 0 -> 587 bytes data/themes/images/e17_shelf_top_right.png | Bin 0 -> 593 bytes src/bin/e_int_shelf_config.c | 26 +- src/bin/e_widget_radio.c | 6 + 17 files changed, 302 insertions(+), 18 deletions(-) create mode 100644 data/themes/images/e17_shelf_bottom.png create mode 100644 data/themes/images/e17_shelf_bottom_left.png create mode 100644 data/themes/images/e17_shelf_bottom_right.png create mode 100644 data/themes/images/e17_shelf_left.png create mode 100644 data/themes/images/e17_shelf_left_bottom.png create mode 100644 data/themes/images/e17_shelf_left_top.png create mode 100644 data/themes/images/e17_shelf_right.png create mode 100644 data/themes/images/e17_shelf_right_bottom.png create mode 100644 data/themes/images/e17_shelf_right_top.png create mode 100644 data/themes/images/e17_shelf_top.png create mode 100644 data/themes/images/e17_shelf_top_left.png create mode 100644 data/themes/images/e17_shelf_top_right.png diff --git a/data/themes/default_icons.edc b/data/themes/default_icons.edc index 0e928fc33..7fc957c09 100644 --- a/data/themes/default_icons.edc +++ b/data/themes/default_icons.edc @@ -32,7 +32,20 @@ images { image: "e17_icon_up_arrow.png" COMP; image: "e17_icon_down_arrow.png" COMP; - image: "e17_pointer.png" COMP; + image: "e17_pointer.png" COMP; + + image: "e17_shelf_bottom_left.png" COMP; + image: "e17_shelf_bottom.png" COMP; + image: "e17_shelf_bottom_right.png" COMP; + image: "e17_shelf_left_bottom.png" COMP; + image: "e17_shelf_left.png" COMP; + image: "e17_shelf_left_top.png" COMP; + image: "e17_shelf_right_bottom.png" COMP; + image: "e17_shelf_right.png" COMP; + image: "e17_shelf_right_top.png" COMP; + image: "e17_shelf_top_left.png" COMP; + image: "e17_shelf_top.png" COMP; + image: "e17_shelf_top_right.png" COMP; } group { @@ -563,6 +576,223 @@ group { normal: "e17_pointer.png"; } } - } - } + } + } +} +group { + name: "icons/enlightenment/shelf_position_bottom"; + max: 24 24; + parts { + part { + name: "icon"; + mouse_events: 0; + description { + state: "default" 0.0; + aspect: 1.0 1.0; + max: 24 24; + image { + normal: "e17_shelf_bottom.png"; + } + } + } + } +} +/// +group { + name: "icons/enlightenment/shelf_position_bottom_left"; + max: 24 24; + parts { + part { + name: "icon"; + mouse_events: 0; + description { + state: "default" 0.0; + aspect: 1.0 1.0; + max: 24 24; + image { + normal: "e17_shelf_bottom_left.png"; + } + } + } + } +} +group { + name: "icons/enlightenment/shelf_position_bottom_right"; + max: 24 24; + parts { + part { + name: "icon"; + mouse_events: 0; + description { + state: "default" 0.0; + aspect: 1.0 1.0; + max: 24 24; + image { + normal: "e17_shelf_bottom_right.png"; + } + } + } + } +} +group { + name: "icons/enlightenment/shelf_position_top"; + max: 24 24; + parts { + part { + name: "icon"; + mouse_events: 0; + description { + state: "default" 0.0; + aspect: 1.0 1.0; + max: 24 24; + image { + normal: "e17_shelf_top.png"; + } + } + } + } +} +group { + name: "icons/enlightenment/shelf_position_top_left"; + max: 24 24; + parts { + part { + name: "icon"; + mouse_events: 0; + description { + state: "default" 0.0; + aspect: 1.0 1.0; + max: 24 24; + image { + normal: "e17_shelf_top_left.png"; + } + } + } + } +} +group { + name: "icons/enlightenment/shelf_position_top_right"; + max: 24 24; + parts { + part { + name: "icon"; + mouse_events: 0; + description { + state: "default" 0.0; + aspect: 1.0 1.0; + max: 24 24; + image { + normal: "e17_shelf_top_right.png"; + } + } + } + } +} +group { + name: "icons/enlightenment/shelf_position_left"; + max: 24 24; + parts { + part { + name: "icon"; + mouse_events: 0; + description { + state: "default" 0.0; + aspect: 1.0 1.0; + max: 24 24; + image { + normal: "e17_shelf_left.png"; + } + } + } + } +} +group { + name: "icons/enlightenment/shelf_position_left_top"; + max: 24 24; + parts { + part { + name: "icon"; + mouse_events: 0; + description { + state: "default" 0.0; + aspect: 1.0 1.0; + max: 24 24; + image { + normal: "e17_shelf_left_top.png"; + } + } + } + } +} +group { + name: "icons/enlightenment/shelf_position_left_bottom"; + max: 24 24; + parts { + part { + name: "icon"; + mouse_events: 0; + description { + state: "default" 0.0; + aspect: 1.0 1.0; + max: 24 24; + image { + normal: "e17_shelf_left_bottom.png"; + } + } + } + } +} +group { + name: "icons/enlightenment/shelf_position_right"; + max: 24 24; + parts { + part { + name: "icon"; + mouse_events: 0; + description { + state: "default" 0.0; + aspect: 1.0 1.0; + max: 24 24; + image { + normal: "e17_shelf_right.png"; + } + } + } + } +} +group { + name: "icons/enlightenment/shelf_position_right_top"; + max: 24 24; + parts { + part { + name: "icon"; + mouse_events: 0; + description { + state: "default" 0.0; + aspect: 1.0 1.0; + max: 24 24; + image { + normal: "e17_shelf_right_top.png"; + } + } + } + } +} +group { + name: "icons/enlightenment/shelf_position_right_bottom"; + max: 24 24; + parts { + part { + name: "icon"; + mouse_events: 0; + description { + state: "default" 0.0; + aspect: 1.0 1.0; + max: 24 24; + image { + normal: "e17_shelf_right_bottom.png"; + } + } + } + } } diff --git a/data/themes/default_radio.edc b/data/themes/default_radio.edc index 9471af742..b11fbc39e 100644 --- a/data/themes/default_radio.edc +++ b/data/themes/default_radio.edc @@ -263,6 +263,19 @@ group { relative: 1.0 0.0; offset: 2 2; } + rel2 { + relative: 1.0 1.0; + offset: -2 -2; + } + } + description { + state: "label_visible" 0.0; + min: 16 16; + rel1 { + to_x: "outline"; + relative: 1.0 0.0; + offset: 2 2; + } rel2 { to_y: "label"; relative: 1.0 0.0; @@ -291,11 +304,25 @@ group { color: 255 255 255 128; } } + part { + name: "label_clip"; + type: RECT; + mouse_events: 0; + description { + state: "default" 0.0; + visible: 0; + } + description { + state: "label_visible" 0.0; + visible: 1; + } + } part { name: "label"; type: TEXT; effect: SHADOW; mouse_events: 0; + clip_to: "label_clip"; description { state: "default" 0.0; min: 16 16; @@ -311,7 +338,7 @@ group { color: 0 0 0 255; color3: 255 255 255 128; text { - text: "Radio Button"; + text: ""; font: "Edje-Vera"; size: 10; min: 1 1; @@ -364,6 +391,14 @@ group { } } programs { + program { + name: "label_on"; + signal: "label_visible"; + source: ""; + action: STATE_SET "label_visible" 0.0; + target: "icon_swallow"; + target: "label_clip"; + } program { name: "turn_on1"; signal: "toggle_on"; diff --git a/data/themes/images/Makefile.am b/data/themes/images/Makefile.am index afeaff048..4f3899016 100644 --- a/data/themes/images/Makefile.am +++ b/data/themes/images/Makefile.am @@ -423,4 +423,17 @@ e17_border7b.png \ e17_shelf_bg_h.png \ e17_shelf_bg_v.png \ e17_shelf_bg2_h.png \ -e17_shelf_bg2_v.png +e17_shelf_bg2_v.png \ +e17_shelf_bottom_left.png \ +e17_shelf_bottom.png \ +e17_shelf_bottom_right.png \ +e17_shelf_left_bottom.png \ +e17_shelf_left.png \ +e17_shelf_left_top.png \ +e17_shelf_right_bottom.png \ +e17_shelf_right.png \ +e17_shelf_right_top.png \ +e17_shelf_top_left.png \ +e17_shelf_top.png \ +e17_shelf_top_right.png + diff --git a/data/themes/images/e17_shelf_bottom.png b/data/themes/images/e17_shelf_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..cc600ecb93c969ef672a05b6ed355c0de0551a25 GIT binary patch literal 597 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjY)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYYs>cdx@v7EBiH8Q9fzmhNfGLKq2E2*N775{M_8syb=cIqSVBa)D(rJ zN`;`r;*!*&+{8Qun<6mN0YU*q^pf*)?G!`#+!z=b7kj!mhIkx*d(}Vha)7|`kN!f< znlIxwrZ*mGV&2emML1<{Y$)F)R`$l=FASc1jVwYzkt$9KT8mgF?dZMPvv|2iZY<+& zyUdjHpZDA^KUR01S$&7Y&;GYe>b*OD_VDjG!c!cREP8NzFWan)hn%-84r%W>@j>Rf z#AEBaN9J9+4Mu`@S!@pR@hLf4oO|?4=>7-Om5VyGUNJ;5X1EunhAd_}W5D@QenwKI z|AAzkq&#(#>kY0G(iQD`cm8Jh^x^Y`s3i@nk93{b$FZMJp*wry!mVs;ly0xq4P#fZ zE7`j2R%7;o*y^g{Dbat{zMl2(a|MG9!@s(elZiV|Ua`n9Uw3wrSJcDsFt>oYbrW(U zR##a^26?7de!8uZy|2@4liAfM=1)J4zH8ktFPUPx@3PjUNY`i83#Tq`C@Wc%EpzN} ztxd1nr9G~D4y=En-rZr(an|&K2Gi{mR&&ptKA7-f**ibUUbm{f_jW%l_@TM#Ca-Vi z<^K|rZ>FVITFpPNJN@*n+Z*q{e_giw{o=@{6}{<_=RSxX5B-p0#CZ9oNYC-d){KJ1 fvwUg~-jwgJTpzS_s?`->Y%_Se`njxgN@xNA_HzL1 literal 0 HcmV?d00001 diff --git a/data/themes/images/e17_shelf_bottom_left.png b/data/themes/images/e17_shelf_bottom_left.png new file mode 100644 index 0000000000000000000000000000000000000000..1f76067ac16838be989ba8cd97b33fcb35e484d3 GIT binary patch literal 589 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjY)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYYs>cdx@v7EBiH8Q9c=2jq1dMKq2E2*N775{M_8syb=cIqSVBa)D(rJ zN`;`r;*!*&+{8Qun<6mN0YU*q^pf*)?G!`#+!z=bXM4IhhIkx*JJs6nu!BIGz52Os zg#eZ*0S-rbH7p%pTzRJwq14%2bP0+u^W zh9B6zG%!v`W9U(S#q8z4dn2@g;rYTjdLOvC9HUOU0+BjYVvyQ)&oVMY3@%(INfuGS|v*f4xq z{8nyuWATAibH25ooRR)c`@{KU<{J!k_D;_?=@=EoY-z35U7)dl$)eC{5f5Tl-JBHk zFzRBREcXhgXszwZxl&et51g2v@`YpjtZ6nEWC|8IiLR2at$tedD&)?>;QX2c+nUzg ze3iwhE@U_5$BE7|tsmka-hJV|{qaxRWrngR!cxf$dSR)~%P%jynswJDutfcWgJa6p zGqsHzReR^1oLv+saxuqjePjCEq*qIJ-~V#HVXuLw5W^#jIL-^!(=8uYGOep);7{DS Vdb;DBWx!Zw@O1TaS?83{1OV(f?(F~o literal 0 HcmV?d00001 diff --git a/data/themes/images/e17_shelf_bottom_right.png b/data/themes/images/e17_shelf_bottom_right.png new file mode 100644 index 0000000000000000000000000000000000000000..025a6bcf93020e2c1a1dda48da34c59e2bbe1156 GIT binary patch literal 574 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjY)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYYs>cdx@v7EBiH8Q9fy-Gp|p@1BHxBTq8=H^K)}k^GX<;i&7IyQd1O? zDiwkfi%U|Aauf3uY>L242M7fe(M!(HwNnh`b7Np&?D2GQ4DmSr_UggB%MJn!5B0YS zFZX5GD%vE>o;RnW<%61K(F5IIes?~L?N$6Lq9_nLVX<0a=gywRQ=e{Iw_tmp$)@y8 z*8h7pTQe8OEc|!As`aNr+`flG*CUdf?Qa}^^gE?NIYlD5DY)jqZ<+TWM7{qU;WA%g z#ZW4=g;(N{#Cj#iA5)H>Hm!S59pow+`h_utafVA#X~<&6H6N{;{yTNvRc2JqIb1Gd z$ls7V;kw`+p8LrRt~Xqd+*;Of+hz5MeO$Zw75dY!c9k-`QNDef?=7=HeaYtKmW}KO zoYQydmbTyB`Tm6PY2ycyAKp(=pZ-+u>f=RscbfZaojjCRa=&optG-jS!wk7(+vYB9 zF!^90c1>`_yBB{eZP+{Wdos7YnOwG8Z_!b|Nz<&eN-r-vRJca>(DZGuh4&nh-s8tO z`Nu;w#%0XQXGR3ic_^cQXu4{sDCZL$);Y&!NV}B1oj9}oe~sDf+878avUA@5 z(zopr0L;Vp#{d8T literal 0 HcmV?d00001 diff --git a/data/themes/images/e17_shelf_left.png b/data/themes/images/e17_shelf_left.png new file mode 100644 index 0000000000000000000000000000000000000000..4500993e5a2ff4d3430ea6fa66bce79dfd31054c GIT binary patch literal 587 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjY)RhkE(~Wt@czMgDWC{vfk$L9 z0|U1(2s1Lwngi0qUgGKN%6^SiluwzvrSRVxppbEiYeb22er|4RUI~M9QEFmIYKlTq zr9x0*aY<@XZepH-O%a&s0HJ^)ddc~@c8Z~VZVU{JGd*1#Lp+XOz2={HIY8j}NB^Yu zpj!c25t|*DI;A&s9^ou%?OIo)Rm7_|(UeYKg)C^kLf0ejvCuE+6f<$j$g5O=pYT5NOjqeT7(!!NA& zH@;z5Bkgy)fswCJi1E;A8#7iRyT`$ArcXR-)}X`SE_lakQy^pC;RMNZ`qHVl#0u1z zL}%(O*dMj_%=6FTi!Z*=R(pV5bZRwOrCsT^#zMf_(>MiotmA?ME z?MZ56)5C&@rPExCwHN1lsYu2CT~@{XS}r78pe^csN%dOmce_KZFLxxZ&wkIB&-^9o z*MFmk`0@eD&2p}e8E3HrcF5xyQKEMbiS=p>E#(H(zQsy_=%d)Y3r(uoD;TB z3B7tUee=vIlU|nml8R@Z(3+TkJku(p@yX+l63Z&Yg$)kx?MS#@SSyo$DADKHF81)i z|BP)P-<0#u3BJ=`%WJ`Lod58TC;a_q+!-f5W}fG|h1urD<%R#1YX0BduWQekm3Vu3 UhO72NU>q}ey85}Sb4q9e0F6WR`Tzg` literal 0 HcmV?d00001 diff --git a/data/themes/images/e17_shelf_left_bottom.png b/data/themes/images/e17_shelf_left_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..6c5a383e536db7f4436b8a20026c7eb9c32d16b2 GIT binary patch literal 592 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjY)RhkE(~Wt@czMgDWC{vfk$L9 z0|U1(2s1Lwngi0qUgGKN%6^Siluw0I)sE90C}dpX8d2h$pPQSSSHj?2l$uzQnxc?Y zsSuP{T#{Opo0z9yQv_x@Kq#PyUUGh}onk1T8v_I5JWm(L5Rc<)uO7_1>>zOLWBl74 zioVXGA)H4Vna%a)>})lEAXw$izsLE0SNg-YD{%r$fr93XI=jy{7N+c6cI1$D@1EVa z{{FMRH&@c)uHv4{YR^jnEe&L2?|G*eGHFl?~!@PYWKi+-$VAg zMK2gacrThM9A;53bf~cII%m4?k@w+lr9C&;C$J?*wXZ%TZJN*<+EIU;cbhF^`;8-a zR7}bnd?#F2tP?J-Wq2&n@0@*^<&No^j?3bP_t*`(@-JSx#dyl%ZEX8nW&!co_bcNc z@I8>v-*tCYU*Yq8Dq>3*y?O3r9eljwr%pmM^Sp;5n;UqZc?L~edNu27-NuML$0l=3 zc*t=3ZP>i$(@sCFWS+1s?$m$A1hd(l@g{Otny*<%fBN#);(|c_EL*0x`DOeQj>O1{ zhxUhD+_L4L^z)9S8z_Y+P#g@y+TG+|MkQ- zvslyRq%P|n;GEa?VVApY#`H6n8U8Xpsf^Q~_qbAL-&=++n!oZ3wtiMnc+YmGIDE$s Z-uagn9XaF9We1FC22WQ%mvv4FO#sc<_HF+}rLp+Xeop##yu!BI`{v%~_ zMqFJk!X*bLa$Rz&TFA~P6U_8dIXq9s!HB8Rp@KQFFsb;bc~p<^%>*~8qp#1Ld;am< z;U$?-DxN`So_}V_2+nWFJW;-rWnH8D1LhkiD(06o=m{_|E3h3qU|0~wwuhnIfoV@D z1K0UXNdZRZ2Lb%-1yO8!nE07=8cTg06dZWgq?j{kFyCtonYhH^8p8$VHSc)8vehxH zQSd%s!t!P7J8iCL)`-(9S?#15oc^YLdiaH1;kvx^`4xN&vR`i9o}bTnOd@^H&54&& zHMOoy{k`j)(}Xo?@2*cE@^0PbJR_`y4*~ Q9~i?7p00i_>zopr01I;JbpQYW literal 0 HcmV?d00001 diff --git a/data/themes/images/e17_shelf_right.png b/data/themes/images/e17_shelf_right.png new file mode 100644 index 0000000000000000000000000000000000000000..26fa5cff403f1cc5506c188b0f4b3742585c65d1 GIT binary patch literal 588 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjY)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYYs>cdx@v7EBiH8Q9fCngna?KfI`M4t`Q~9`MJ5Nc_j?aMX8A;sVNFc zl?p+L#U-glxruoSHbr2j1B3#K=q2ap+9`(exiK&>&hm6|4DmRA_1eZfVMhVB2k#$k zo}|HdWQ&-HheBXbK-44OMIWRxD>SXNw%0MJh<60sa8gh@JX0e6(c+n#{gxXScElQ7 z@-V;j?*DoF-PXkgUECtk-?-UNP$t=e@+H z{27n9Dw!Pv8P^JLDeRbhvXWxu zDi$3-R8CkqN&V^DbcV_1@OkTB>pe2|-+ynf-SsHPYVJCbm~fl^H=jGq126D>5R>C$ zYc~J4<{64`vIfG+ylb6|Ez-NhezHPTBI;VQV^1-`=vx_V#wsXDLQEIU8d& zJhJv(7JBP)@Rs+-`x+~5ZIW7&&A0O7fxOBL)rxyA0pC7vd33tXeQTcrZ;y0L@A2fh ze(emk-QNw_H)YhMitBd1o_B3u@SEcsUh=db&Rl=J+ES`lg|Vd1U*i7e*z%7O=MSGh zB_#XMaZAp`v-|nxl)X8-D*ZyQ>ub`hEZa literal 0 HcmV?d00001 diff --git a/data/themes/images/e17_shelf_right_bottom.png b/data/themes/images/e17_shelf_right_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..1f26807b71f532ac8f14315eb6b23b2dda97bbf4 GIT binary patch literal 586 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjY)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYYs>cdx@v7EBiH8Q9e0Cjj8zyfI`M4t`Q~9`MJ5Nc_j?aMX8A;sVNFc zl?p+L#U-glxruoSHbr2j1B3#K=q2ap+9`(exiK&>&hT_`4DmR=b?SM)LkM8i%!U)Lv21Br z`pxQ7B*Qc%{Uuye4&$J_||{6*+2LE^Ik?7 z?{2oqC!eT!3VoaCxFXzT*0LjocQg)MTaxtS+S&U(T&-!d)AL*cLl}DI{hqegyDMvY z$c)cod%(AY-K{zxY#*cly(L?_ Twh2xFMlpk@tDnm{r-UW|;0f-; literal 0 HcmV?d00001 diff --git a/data/themes/images/e17_shelf_right_top.png b/data/themes/images/e17_shelf_right_top.png new file mode 100644 index 0000000000000000000000000000000000000000..236c5da181e96fd951eff609e12370dbc89560b6 GIT binary patch literal 623 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjY)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYYs>cdx@v7EBiH8Q9gP85AU75fI`M4t`Q~9`MJ5Nc_j?aMX8A;sVNFc zl?p+L#U-glxruoSHbr2j1B3#K=q2ap+9`(exiK&>?)7wW4DmR=b=qAoCP#@j`Ri9j zmTs6YypY3c)nmS0-FgeTJKimv-L>w}V+V~50o^Lav74iAzkDJqnX@AH2Af?;+24EV zb^GKQ&o#&;bQvZ0%=A%PcK`kCNk`r{NGI@|X()fd?eX->Z4JiM1#E8^*pJP)tkKo+ zc!t0Y=5-B<225%PWISvb9(Sx`lKOOWi+d^30TZ zvE#MF=F2blY`gvTao+abJq_Fs#3};J{8=MYbVL_=9TnTaFLUx-x7{L_ZfVAT*ZYj; zRL@Uc)5`qDPs}Xl@YIx#l9Iw_UyEBkjJkFw>XqlJ`>R%Fr&e1nWZo3UxJrn-=u7je zn%K3f3BHDR3RWeWx|?ooSZ4C-QVf&Sfn9m`nI_L^=qic2l(nN_+OGo7FMD*21s3q- zFxCSgSkR*6DfGxftuHx7iO2caW5d67_v>s}*Y!N$KOif>`1WQ_nOxgK zVF`tA2BmHFX^9~NDHY2mp@Ly4nF`hi>oQ*Hw5oX`f5 z9c*%q;t2}{-!SmdKI;Vst0P(){Gynhq literal 0 HcmV?d00001 diff --git a/data/themes/images/e17_shelf_top_left.png b/data/themes/images/e17_shelf_top_left.png new file mode 100644 index 0000000000000000000000000000000000000000..563687b17be238920fe25e2d1776305e9d4f5b19 GIT binary patch literal 587 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjY)RhkE(~Wt@czMgDWC{vfk$L9 z0|U1(2s1Lwngi0qUgGKN%6^SiluwC$%AMw8Kq2E2*N775{M_8syb=cIqSVBa)D(rJ zN`;`r;*!*&+{8Qun<6mN0YU*q^pf*)?G!`#+!z=bXL`CghIkx*JJr{Z$x*=VzJsy= z&#@y%rm{a^)3ap^e;}t9Q^78-XW7I)bE&uZj0_Vu9|^%(jhW{0ler{QIttTOr~X{M zDm-@PKdYHOYK>geQYABIU3&k0Wk&yjsi!yPq$e`GuidksF|NTsVd(~`0QM*cb_=$u z16#c>ZwdN-ue$BP4M{zTB$kmsXnoyYY|lf5ZLR#w<7+Ym~d8^Rc_X+vRO(R)}@#+eYR!%cHrf!I$n!u zDe8;PpXm%`-B6h_Z-tuQ@_PS+y3Em28BXckEP642wHb3lh~uX3Uj+?*uzkP0wR(}( Su{ppvX7F_Nb6Mw<&;$TEHs-+q literal 0 HcmV?d00001 diff --git a/data/themes/images/e17_shelf_top_right.png b/data/themes/images/e17_shelf_top_right.png new file mode 100644 index 0000000000000000000000000000000000000000..edac6f20522018e5277b97f1b97c694bb78447ec GIT binary patch literal 593 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjY)RhkE(~Wt@czMgDWC{vfk$L9 z0|U1(2s1Lwngi0qUgGKN%6^Silut=UZl{+PP{_E%HKN2hKQ}iuuY|$5C^fMpHANw* zQXwd@xFoeGH!)AarU=Y*fKWgYz2y8{JH=2wHwFgA`JOJ0As)xyUNh{w>>zUNQ*&Fh+`=l+1>ZRXh{6tvvF4MVdgeYs~wUNBtjMd>Za=)LkvGziXq+ zgl#5kw~7BXG3(({zu{79eL$_dbWNS?UzrK-s&z9Yi)XEPlDbCxg8=|WM9 zWehm0b(`+}OOaz*qJK~G-Q&azt&fc7l`3Z(+$P&lYtQ#mRWdDf4@d6iADc7&6~-ie aV?PzSP+?Jkt~@ZN89ZJ6T-G@yGywo;EA{vQ literal 0 HcmV?d00001 diff --git a/src/bin/e_int_shelf_config.c b/src/bin/e_int_shelf_config.c index d6e005826..4854e8436 100644 --- a/src/bin/e_int_shelf_config.c +++ b/src/bin/e_int_shelf_config.c @@ -183,29 +183,29 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf of = e_widget_frametable_add(evas, _("Layout"), 1); rg = e_widget_radio_group_new(&(cfdata->orient)); - ob = e_widget_radio_icon_add(evas, _("Left"), "enlightenment/e", 32, 32, E_GADCON_ORIENT_LEFT, rg); + ob = e_widget_radio_icon_add(evas, NULL, "enlightenment/shelf_position_left", 24, 24, E_GADCON_ORIENT_LEFT, rg); e_widget_frametable_object_append(of, ob, 0, 2, 1, 1, 1, 1, 1, 1); - ob = e_widget_radio_icon_add(evas, _("Right"), "enlightenment/e", 32, 32, E_GADCON_ORIENT_RIGHT, rg); + ob = e_widget_radio_icon_add(evas, NULL, "enlightenment/shelf_position_right", 24, 24, E_GADCON_ORIENT_RIGHT, rg); e_widget_frametable_object_append(of, ob, 4, 2, 1, 1, 1, 1, 1, 1); - ob = e_widget_radio_icon_add(evas, _("Top"), "enlightenment/e", 32, 32, E_GADCON_ORIENT_TOP, rg); + ob = e_widget_radio_icon_add(evas, NULL, "enlightenment/shelf_position_top", 24, 24, E_GADCON_ORIENT_TOP, rg); e_widget_frametable_object_append(of, ob, 2, 0, 1, 1, 1, 1, 1, 1); - ob = e_widget_radio_icon_add(evas, _("Bottom"), "enlightenment/e", 32, 32, E_GADCON_ORIENT_BOTTOM, rg); + ob = e_widget_radio_icon_add(evas, NULL, "enlightenment/shelf_position_bottom", 24, 24, E_GADCON_ORIENT_BOTTOM, rg); e_widget_frametable_object_append(of, ob, 2, 4, 1, 1, 1, 1, 1, 1); - ob = e_widget_radio_icon_add(evas, _("Corner"), "enlightenment/e", 32, 32, E_GADCON_ORIENT_CORNER_TL, rg); + ob = e_widget_radio_icon_add(evas, NULL, "enlightenment/shelf_position_top_left", 24, 24, E_GADCON_ORIENT_CORNER_TL, rg); e_widget_frametable_object_append(of, ob, 1, 0, 1, 1, 1, 1, 1, 1); - ob = e_widget_radio_icon_add(evas, _("Corner"), "enlightenment/e", 32, 32, E_GADCON_ORIENT_CORNER_TR, rg); + ob = e_widget_radio_icon_add(evas, NULL, "enlightenment/shelf_position_top_right", 24, 24, E_GADCON_ORIENT_CORNER_TR, rg); e_widget_frametable_object_append(of, ob, 3, 0, 1, 1, 1, 1, 1, 1); - ob = e_widget_radio_icon_add(evas, _("Corner"), "enlightenment/e", 32, 32, E_GADCON_ORIENT_CORNER_BL, rg); + ob = e_widget_radio_icon_add(evas, NULL, "enlightenment/shelf_position_bottom_left", 24, 24, E_GADCON_ORIENT_CORNER_BL, rg); e_widget_frametable_object_append(of, ob, 1, 4, 1, 1, 1, 1, 1, 1); - ob = e_widget_radio_icon_add(evas, _("Corner"), "enlightenment/e", 32, 32, E_GADCON_ORIENT_CORNER_BR, rg); + ob = e_widget_radio_icon_add(evas, NULL, "enlightenment/shelf_position_bottom_right", 24, 24, E_GADCON_ORIENT_CORNER_BR, rg); e_widget_frametable_object_append(of, ob, 3, 4, 1, 1, 1, 1, 1, 1); - ob = e_widget_radio_icon_add(evas, _("Corner"), "enlightenment/e", 32, 32, E_GADCON_ORIENT_CORNER_LT, rg); + ob = e_widget_radio_icon_add(evas, NULL, "enlightenment/shelf_position_left_top", 24, 24, E_GADCON_ORIENT_CORNER_LT, rg); e_widget_frametable_object_append(of, ob, 0, 1, 1, 1, 1, 1, 1, 1); - ob = e_widget_radio_icon_add(evas, _("Corner"), "enlightenment/e", 32, 32, E_GADCON_ORIENT_CORNER_RT, rg); + ob = e_widget_radio_icon_add(evas, NULL, "enlightenment/shelf_position_right_top", 24, 24, E_GADCON_ORIENT_CORNER_RT, rg); e_widget_frametable_object_append(of, ob, 4, 1, 1, 1, 1, 1, 1, 1); - ob = e_widget_radio_icon_add(evas, _("Corner"), "enlightenment/e", 32, 32, E_GADCON_ORIENT_CORNER_LB, rg); + ob = e_widget_radio_icon_add(evas, NULL, "enlightenment/shelf_position_left_bottom", 24, 24, E_GADCON_ORIENT_CORNER_LB, rg); e_widget_frametable_object_append(of, ob, 0, 3, 1, 1, 1, 1, 1, 1); - ob = e_widget_radio_icon_add(evas, _("Corner"), "enlightenment/e", 32, 32, E_GADCON_ORIENT_CORNER_RB, rg); + ob = e_widget_radio_icon_add(evas, NULL, "enlightenment/shelf_position_right_bottom", 24, 24, E_GADCON_ORIENT_CORNER_RB, rg); e_widget_frametable_object_append(of, ob, 4, 3, 1, 1, 1, 1, 1, 1); e_widget_list_object_append(o2, of, 1, 1, 0.5); @@ -246,7 +246,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf sel = n; } e_widget_min_size_get(oi, &wmw, &wmh); - e_widget_min_size_set(oi, wmw, 150); + e_widget_min_size_set(oi, wmw, 120); e_widget_ilist_go(oi); e_widget_ilist_selected_set(oi, sel); diff --git a/src/bin/e_widget_radio.c b/src/bin/e_widget_radio.c index 0920707b4..bf44e557a 100644 --- a/src/bin/e_widget_radio.c +++ b/src/bin/e_widget_radio.c @@ -106,6 +106,12 @@ e_widget_radio_icon_add(Evas *evas, char *label, char *icon, int icon_w, int ico edje_object_signal_callback_add(o, "toggled", "*", _e_wid_signal_cb1, obj); edje_object_part_text_set(o, "label", label); evas_object_show(o); + + if (label) + { + edje_object_signal_emit(o, "label_visible", ""); + edje_object_message_signal_process(o); + } if (icon) {