Fixed 2011/2/9 Nicolas Aguirre <[email protected]>
> Spank ! > edje_cc: Error. Unable to load image "images/scrollframe_im2.png" used > by file "detour-elm.edj": File (or file path) does not exist. Check if > path to file "images/scrollframe_im2.png" is correct (both directory > and file name). > > > 2011/2/9 Enlightenment SVN <[email protected]>: > > Log: > > detour-elm: add entry and improve some widgets > > > > > > > > Author: watchwolf > > Date: 2011-02-09 08:30:36 -0800 (Wed, 09 Feb 2011) > > New Revision: 56847 > > Trac: http://trac.enlightenment.org/e/changeset/56847 > > > > Added: > > trunk/THEMES/detour-elm/entry_text.edc > trunk/THEMES/detour-elm/images/entry_im0.png > trunk/THEMES/detour-elm/images/entry_im1.png > > Modified: > > trunk/THEMES/detour-elm/Makefile trunk/THEMES/detour-elm/images.edc > trunk/THEMES/detour-elm/images/shelf_def_im0.png > trunk/THEMES/detour-elm/images/win_background.png > trunk/THEMES/detour-elm/main.edc > > > > Modified: trunk/THEMES/detour-elm/Makefile > > =================================================================== > > --- trunk/THEMES/detour-elm/Makefile 2011-02-09 16:14:02 UTC (rev > 56846) > > +++ trunk/THEMES/detour-elm/Makefile 2011-02-09 16:30:36 UTC (rev > 56847) > > @@ -7,7 +7,7 @@ > > RM = /bin/rm -f > > TAIL = /usr/bin/tail > > COMPILE = $(CC) $(EDJE_CC_FLAGS) > > -SRC = main.edc > > +SRC = main.edc entry_text.edc > > OUT = detour-elm.edj > > PATH_INSTALL = $(HOME)/.elementary/themes > > > > > > > > Property changes on: trunk/THEMES/detour-elm/images/entry_im0.png > > ___________________________________________________________________ > > Added: svn:mime-type > > + application/octet-stream > > > > > > Property changes on: trunk/THEMES/detour-elm/images/entry_im1.png > > ___________________________________________________________________ > > Added: svn:mime-type > > + application/octet-stream > > > > Modified: trunk/THEMES/detour-elm/images/shelf_def_im0.png > > =================================================================== > > (Binary files differ) > > > > Modified: trunk/THEMES/detour-elm/images/win_background.png > > =================================================================== > > (Binary files differ) > > > > Modified: trunk/THEMES/detour-elm/images.edc > > =================================================================== > > --- trunk/THEMES/detour-elm/images.edc 2011-02-09 16:14:02 UTC (rev > 56846) > > +++ trunk/THEMES/detour-elm/images.edc 2011-02-09 16:30:36 UTC (rev > 56847) > > @@ -14,6 +14,11 @@ > > //~ Window > > image: "images/win_background.png" COMP; /* background */ > > > > +//~ entry > > +image: "images/entry_im0.png" COMP; /* base */ > > +image: "images/entry_im1.png" COMP; /* focus */ > > + > > + > > //~ button > > image: "images/button_im0.png" COMP; /* base */ > > image: "images/button_im1.png" COMP; /* enabled */ > > @@ -42,6 +47,7 @@ > > > > //~ scrollframe > > image: "images/scrollframe_im1.png" COMP; /* inset */ > > +image: "images/scrollframe_im2.png" COMP; /* focus */ > > image: "images/scrollframe-bar_im0.png" COMP; /* vertical bar */ > > image: "images/scrollframe-bar_im1.png" COMP; /* vertical bar */ > > image: "images/scrollframe-bar_im2.png" COMP; /* vertical bar */ > > > > Modified: trunk/THEMES/detour-elm/main.edc > > =================================================================== > > --- trunk/THEMES/detour-elm/main.edc 2011-02-09 16:14:02 UTC (rev > 56846) > > +++ trunk/THEMES/detour-elm/main.edc 2011-02-09 16:30:36 UTC (rev > 56847) > > @@ -34,6 +34,7 @@ > > > > > > collections { > > +#include "entry_text.edc" > > > /////////////////////////////////////////////////////////////////////////////// > > group { > > name: "elm/bg/base/default"; > > @@ -44,18 +45,11 @@ > > image.normal: "images/win_background.png"; > > } > > } > > - part { > > - name: "popover"; > > - mouse_events: 0; > > - description { > > - state: "default" 0.0; > > - rel1.offset: -20 -20; > > - rel2.relative: 1.0 0.5; > > - rel2.offset: 20 0; > > - image { > > - normal: "images/button_im4.png"; > > - border: 4 4 4 0; > > - } > > + part { name: "base2"; > > + type: RECT; > > + mouse_events: 0; > > + description { state: "default" 0.0; > > + color: 0 0 0 100; > > } > > } > > part { name: "elm.swallow.background"; > > @@ -142,6 +136,22 @@ > > fill.smooth : 0; > > } > > } > > + part { name: "focus"; > > + mouse_events: 0; > > + description { state: "default" 0.0; > > + rel1.offset: 0 0; > > + rel2.offset: -1 -1; > > + image { > > + normal: "images/scrollframe_im2.png"; > > + border: 7 7 7 7; > > + } > > + color: 255 255 255 0; > > + } > > + description { state: "visible" 0.0; > > + inherit: "default" 0.0; > > + color: 255 255 255 255; > > + } > > + } > > part { name: "sb_vbar_clip_master"; > > type: RECT; > > mouse_events: 0; > > @@ -362,7 +372,22 @@ > > set_int(sbvis_timer, 0); > > } > > } > > - > > + program { > > + name: "focused"; > > + signal: "elm,action,focus"; > > + source: "elm"; > > + action: STATE_SET "visible" 0.0; > > + transition: DECELERATE 0.5; > > + target: "focus"; > > + } > > + program { > > + name: "unfocused"; > > + signal: "elm,action,unfocus"; > > + source: "elm"; > > + action: STATE_SET "default" 0.0; > > + transition: DECELERATE 0.5; > > + target: "focus"; > > + } > > program { name: "vbar_show"; > > signal: "elm,action,show,vbar"; > > source: "elm"; > > @@ -500,20 +525,119 @@ > > set_int(sbvis_timer, v); > > } > > } > > + > > + > > } > > } > > + group { > > + name: "elm/scroller/entry/default"; > > + script { > > + public sbvis_v, sbvis_h, sbalways_v, sbalways_h, sbvis_timer; > > + public timer0(val) { > > + new v; > > + v = get_int(sbvis_v); > > + if (v) { > > + v = get_int(sbalways_v); > > + if (!v) { > > + emit("do-hide-vbar", ""); > > + set_int(sbvis_v, 0); > > + } > > + } > > + v = get_int(sbvis_h); > > + if (v) { > > + v = get_int(sbalways_h); > > + if (!v) { > > + emit("do-hide-hbar", ""); > > + set_int(sbvis_h, 0); > > + } > > + } > > + set_int(sbvis_timer, 0); > > + return 0; > > + } > > + } > > + parts { > > + part { name: "clipper"; > > + type: RECT; > > + mouse_events: 0; > > + description { state: "default" 0.0; > > + rel1.offset: 10 5; > > + rel2.offset: -11 -6; > > + } > > + } > > + part { name: "base"; > > + mouse_events: 0; > > + description { state: "default" 0.0; > > + rel1.offset: 0 0; > > + rel2.offset: -1 -1; > > + image { > > + normal: "images/entry_im0.png"; > > + border: 5 5 5 5; > > + middle: 1; > > + } > > + fill.smooth : 0; > > + } > > + } > > + part { name: "elm.swallow.content"; > > + clip_to: "clipper"; > > + type: SWALLOW; > > + description { state: "default" 0.0; > > + rel1.offset: 10 5; > > + rel2.offset: -11 -6; > > + } > > + } > > + } > > + programs { > > + program { name: "load"; > > + signal: "load"; > > + source: ""; > > + script { > > + set_int(sbvis_h, 0); > > + set_int(sbvis_v, 0); > > + set_int(sbalways_v, 0); > > + set_int(sbalways_h, 0); > > + set_int(sbvis_timer, 0); > > + } > > + } > > + > > + program { name: "scroll"; > > + signal: "elm,action,scroll"; > > + source: "elm"; > > + script { > > + new v; > > + v = get_int(sbvis_v); > > + v |= get_int(sbalways_v); > > + if (!v) { > > + emit("do-show-vbar", ""); > > + set_int(sbvis_v, 1); > > + } > > + v = get_int(sbvis_h); > > + v |= get_int(sbalways_h); > > + if (!v) { > > + emit("do-show-hbar", ""); > > + set_int(sbvis_h, 1); > > + } > > + v = get_int(sbvis_timer); > > + if (v > 0) cancel_timer(v); > > + v = timer(2.0, "timer0", 0); > > + set_int(sbvis_timer, v); > > + } > > + } > > + } > > + } > > + > > > /////////////////////////////////////////////////////////////////////////////// > > group { > > name: "elm/label/base/default"; > > styles > > { > > style { name: "textblock_style"; > > - base: "font=DejaVuSans.ttf font_size=10 align=left > color=#000 wrap=word"; > > + base: "font=DejaVuSans font_size=10 align=left > color=#000 wrap=word"; > > > > tag: "br" "\n"; > > - tag: "hilight" "+ font=DejaVuSans-Bold.ttf"; > > - tag: "b" "+ font=DejaVuSans-Bold.ttf"; > > + tag: "hilight" "+ font=DejaVuSans-Bold"; > > + tag: "b" "+ font=DejaVuSans-Bold"; > > tag: "tab" "\t"; > > + tag: "title" "+ font_size=12 font=DejaVuSans-Bold"; > > } > > } > > parts { > > @@ -561,7 +685,7 @@ > > mouse_events: 0; > > description { > > state: "default" 0.0; > > - min: 50 26; > > + min: 32 32; > > rel1 { > > offset: 3 4; > > } > > @@ -1013,7 +1137,7 @@ > > mouse_events: 0; > > description { > > state: "default" 0.0; > > - min: 50 26; > > + min: 26 26; > > rel1 { > > offset: 3 4; > > } > > @@ -2159,7 +2283,7 @@ > > offset: -5 -1; > > } > > text { > > - text: "Frame Label"; > > + text: ""; > > font: "DejaVuSans-Bold"; > > size: 11; > > min: 1 1; > > @@ -3600,6 +3724,7 @@ > > name: "left_arrow"; > > type: IMAGE; > > mouse_events: 1; > > + repeat_events: 1; > > description { > > state: "default" 0.0; > > min: 22 22; > > @@ -3623,6 +3748,7 @@ > > name: "right_arrow"; > > type: IMAGE; > > mouse_events: 1; > > + repeat_events: 1; > > description { > > state: "default" 0.0; > > min: 22 22; > > @@ -6912,6 +7038,5 @@ > > } > > } > > } > > - > > } > > > > > > > > > ------------------------------------------------------------------------------ > > The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE: > > Pinpoint memory and threading errors before they happen. > > Find and fix more than 250 security defects in the development cycle. > > Locate bottlenecks in serial and parallel code that limit performance. > > http://p.sf.net/sfu/intel-dev2devfeb > > _______________________________________________ > > enlightenment-svn mailing list > > [email protected] > > https://lists.sourceforge.net/lists/listinfo/enlightenment-svn > > > > > > -- > Nicolas Aguirre > Mail: [email protected] > Web: http://enna.geexbox.org > Blog: http://dev.enlightenment.fr/~captainigloo/ > > > ------------------------------------------------------------------------------ > The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE: > Pinpoint memory and threading errors before they happen. > Find and fix more than 250 security defects in the development cycle. > Locate bottlenecks in serial and parallel code that limit performance. > http://p.sf.net/sfu/intel-dev2devfeb > _______________________________________________ > enlightenment-devel mailing list > [email protected] > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel > -- Regards. ------------------------------------------------------------------------------ The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE: Pinpoint memory and threading errors before they happen. Find and fix more than 250 security defects in the development cycle. Locate bottlenecks in serial and parallel code that limit performance. http://p.sf.net/sfu/intel-dev2devfeb _______________________________________________ enlightenment-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
