summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorYoungbok Shin <youngb.shin@samsung.com>2017-12-06 17:33:03 +0900
committerSungtaek Hong <sth253.hong@samsung.com>2017-12-08 16:02:24 +0900
commit300ded6c305459bc578c07a9905dfab8a48bfd63 (patch)
treeba9c0edbce688e7af093b81f3354056d571d5237 /data
parentbbb70f0e9b08a7e5c8ef3a6419d47679b1e8319c (diff)
efl_ui_text: apply new theme logic and use constructor/destructor
Summary: It removes legacy aliases from efl_ui_text's theme. And it also move all code from group add/del overriding functions to constructor/destructor. @fix Test Plan: N/A Reviewers: jpeg, taxi2se Subscribers: cedric Differential Revision: https://phab.enlightenment.org/D5601
Diffstat (limited to 'data')
-rw-r--r--data/elementary/themes/edc/efl/text.edc760
-rw-r--r--data/elementary/themes/edc/elm/entry.edc106
2 files changed, 675 insertions, 191 deletions
diff --git a/data/elementary/themes/edc/efl/text.edc b/data/elementary/themes/edc/efl/text.edc
index 5ee4227586..728c905399 100644
--- a/data/elementary/themes/edc/efl/text.edc
+++ b/data/elementary/themes/edc/efl/text.edc
@@ -1,62 +1,522 @@
1group { "efl/text/scroller"; 1group { "efl/text/scroller";
2 inherit: "elm/scroller/entry/default"; 2 inherit: "elm/scroller/base/default";
3 image: "bg_glow_in.png" COMP;
4 parts {
5 part { name: "elm.swallow.background"; type: SWALLOW;
6 clip_to: "clipper";
7 description { state: "default" 0.0;
8 rel1.offset: 1 1;
9 rel2.offset: -2 -2;
10 }
11 }
12 part { name: "validation_glow";
13 type: RECT;
14 insert_before: "bg";
15 mouse_events: 0;
16 description { state: "default" 0.0;
17 color: 0 0 0 0;
18 }
19 description { state: "pass" 0.0;
20 color: 0 255 0 90;
21 }
22 description { state: "fail" 0.0;
23 color: 255 0 0 90;
24 }
25 }
26 part { name: "bg";
27 description { state: "default" 0.0;
28 color: DARK_GREY_BG_COLOR;
29 }
30 }
31 part { name: "elm.swallow.content";
32 description { state: "default" 0.0;
33 rel1.to: "elm.swallow.icon";
34 rel1.relative: 1.0 0.0;
35 rel1.offset: 0 0;
36 rel2.to: "elm.swallow.end";
37 rel2.relative: 0.0 1.0;
38 rel2.offset: -1 -1;
39 }
40 }
41 part { name: "elm.swallow.icon"; type: SWALLOW;
42 clip_to: "clipper";
43 description { state: "default" 0.0;
44 fixed: 1 1;
45 rel1.to: "clipper";
46 rel1.offset: 1 1;
47 rel2.to: "clipper";
48 rel2.offset: 1 -2;
49 rel2.relative: 0.0 1.0;
50 visible: 0;
51 align: 1.0 0.0;
52 }
53 description { state: "visible" 0.0;
54 inherit: "default" 0.0;
55 visible: 1;
56 align: 0.0 0.0;
57 }
58 }
59 program {
60 signal: "elm,action,show,icon"; source: "elm";
61 action: STATE_SET "visible" 0.0;
62 target: "elm.swallow.icon";
63 }
64 program {
65 signal: "elm,action,hide,icon"; source: "elm";
66 action: STATE_SET "default" 0.0;
67 target: "elm.swallow.icon";
68 }
69 part { name: "elm.swallow.end"; type: SWALLOW;
70 clip_to: "clipper";
71 description { state: "default" 0.0;
72 fixed: 1 1;
73 rel1.to: "clipper";
74 rel1.offset: -2 1;
75 rel1.relative: 1.0 0.0;
76 rel2.to: "clipper";
77 rel2.offset: -2 -2;
78 visible: 0;
79 align: 0.0 0.0;
80 }
81 description { state: "visible" 0.0;
82 inherit: "default" 0.0;
83 visible: 1;
84 align: 1.0 0.0;
85 }
86 }
87 program {
88 signal: "elm,action,show,end"; source: "elm";
89 action: STATE_SET "visible" 0.0;
90 target: "elm.swallow.end";
91 }
92 program {
93 signal: "elm,action,hide,end"; source: "elm";
94 action: STATE_SET "default" 0.0;
95 target: "elm.swallow.end";
96 }
97 part { name: "glow";
98 insert_after: "shadow";
99 mouse_events: 0;
100 description { state: "default" 0.0;
101 rel1.to: "bg";
102 rel2.to: "bg";
103 image.normal: "bg_glow_in.png";
104 image.border: 7 7 7 7;
105 image.middle: 0;
106 fill.smooth: 0;
107 color: 255 255 255 0;
108 }
109 description { state: "focused" 0.0;
110 inherit: "default" 0.0;
111 color: 255 255 255 255;
112 }
113 description { state: "focused2" 0.0;
114 inherit: "default" 0.0;
115 color: 255 255 255 64;
116 }
117 }
118 }
119 programs {
120 program {
121 signal: "elm,action,focus_highlight,show"; source: "elm";
122 action: STATE_SET "focused" 0.0;
123 target: "glow";
124 after: "focus_in2";
125 }
126 program { name: "focus_in2";
127 action: STATE_SET "focused2" 0.0;
128 transition: DECELERATE 0.5;
129 target: "glow";
130 }
131 program {
132 signal: "elm,action,focus_highlight,hide"; source: "elm";
133 action: STATE_SET "default" 0.0;
134 transition: DECELERATE 0.3;
135 target: "glow";
136 }
137 program { name: "validation_fail";
138 signal: "validation,default,fail";
139 source: "elm";
140 action: STATE_SET "fail" 0.0;
141 target: "validation_glow";
142 }
143 program { name: "validation_pass";
144 signal: "validation,default,pass";
145 source: "elm";
146 action: STATE_SET "pass" 0.0;
147 target: "validation_glow";
148 }
149 program { name: "validation_off";
150 signal: "validation,default";
151 source: "elm";
152 action: STATE_SET "default" 0.0;
153 target: "validation_glow";
154 }
155 }
3} 156}
4 157
5group { "efl/text/single/scroller"; 158group { "efl/text/single/scroller";
6 inherit: "elm/scroller/entry_single/default"; 159 images.image: "bevel_in.png" COMP;
160 images.image: "inset_shadow.png" COMP;
161 image: "bg_glow_in.png" COMP;
162 data.item: "focus_highlight" "on";
163 parts {
164 part { name: "validation_glow";
165 type: RECT;
166 insert_before: "bg";
167 mouse_events: 0;
168 description { state: "default" 0.0;
169 color: 0 0 0 0;
170 }
171 description { state: "pass" 0.0;
172 color: 0 255 0 90;
173 }
174 description { state: "fail" 0.0;
175 color: 255 0 0 90;
176 }
177 }
178 part { name: "sb_vbar_base"; type: RECT;
179 description { state: "default" 0.0;
180 fixed: 1 1;
181 rel2.relative: 1.0 0.0;
182 visible: 0;
183 }
184 }
185 part { name: "elm.dragable.vbar"; type: RECT;
186 dragable.x: 0 0 0;
187 dragable.y: 1 1 0;
188 dragable.confine: "sb_vbar_base";
189 description { state: "default" 0.0;
190 fixed: 1 1;
191 rel1.relative: 0.5 0.5;
192 rel1.to: "sb_vbar_base";
193 rel2.relative: 0.5 0.5;
194 rel2.to: "sb_vbar_base";
195 visible: 0;
196 }
197 }
198 part { name: "sb_hbar_base"; type: RECT;
199 description { state: "default" 0.0;
200 fixed: 1 1;
201 rel1.relative: 1.0 0.0;
202 visible: 0;
203 }
204 }
205 part { name: "elm.dragable.hbar"; type: RECT;
206 dragable.x: 1 1 0;
207 dragable.y: 0 0 0;
208 dragable.confine: "sb_hbar_base";
209 description { state: "default" 0.0;
210 fixed: 1 1;
211 rel1.relative: 0.5 0.5;
212 rel1.to: "sb_hbar_base";
213 rel2.relative: 0.5 0.5;
214 rel2.to: "sb_hbar_base";
215 visible: 0;
216 }
217 }
218 part { name: "bg"; type: RECT;
219 description { state: "default" 0.0;
220 rel1.to: "elm.swallow.background";
221 rel2.to: "elm.swallow.background";
222 color: DARK_GREY_BG_COLOR;
223 color_class: "scroller_bg";
224 }
225 }
226 part { name: "clipper"; type: RECT;
227 description { state: "default" 0.0;
228 rel1.to: "elm.swallow.background";
229 rel2.to: "elm.swallow.background";
230 }
231 }
232 part { name: "elm.swallow.background"; type: SWALLOW;
233 clip_to: "clipper";
234 description { state: "default" 0.0;
235 rel1.offset: 1 1;
236 rel2.offset: -2 -2;
237 }
238 }
239 part { name: "elm.swallow.content"; type: SWALLOW;
240 clip_to: "clipper";
241 description { state: "default" 0.0;
242 rel1.to: "elm.swallow.icon";
243 rel1.relative: 1.0 0.0;
244 rel2.to: "elm.swallow.end";
245 rel2.relative: 0.0 1.0;
246 }
247 }
248 part { name: "elm.swallow.icon"; type: SWALLOW;
249 clip_to: "clipper";
250 description { state: "default" 0.0;
251 fixed: 1 1;
252 rel1.offset: 1 1;
253 rel2.offset: 1 -2;
254 rel2.relative: 0.0 1.0;
255 visible: 0;
256 align: 1.0 0.5;
257 }
258 description { state: "visible" 0.0;
259 inherit: "default" 0.0;
260 visible: 1;
261 align: 0.0 0.5;
262 }
263 }
264 program {
265 signal: "elm,action,show,icon"; source: "elm";
266 action: STATE_SET "visible" 0.0;
267 target: "elm.swallow.icon";
268 }
269 program {
270 signal: "elm,action,hide,icon"; source: "elm";
271 action: STATE_SET "default" 0.0;
272 target: "elm.swallow.icon";
273 }
274 part { name: "elm.swallow.end"; type: SWALLOW;
275 clip_to: "clipper";
276 description { state: "default" 0.0;
277 fixed: 1 1;
278 rel1.offset: -2 1;
279 rel1.relative: 1.0 0.0;
280 rel2.offset: -2 -2;
281 visible: 0;
282 align: 0.0 0.5;
283 }
284 description { state: "visible" 0.0;
285 inherit: "default" 0.0;
286 visible: 1;
287 align: 1.0 0.5;
288 }
289 }
290 program {
291 signal: "elm,action,show,end"; source: "elm";
292 action: STATE_SET "visible" 0.0;
293 target: "elm.swallow.end";
294 }
295 program {
296 signal: "elm,action,hide,end"; source: "elm";
297 action: STATE_SET "default" 0.0;
298 target: "elm.swallow.end";
299 }
300 part { name: "inset"; mouse_events: 0;
301 description { state: "default" 0.0;
302 image.normal: "bevel_in.png";
303 image.border: 1 1 1 1;
304 image.middle: 0;
305 rel1.to: "bg";
306 rel1.offset: -1 -1;
307 rel2.to: "bg";
308 rel2.offset: 0 0;
309 fill.smooth: 0;
310 }
311 }
312 part { name: "shadow"; mouse_events: 0;
313 description { state: "default" 0.0;
314 image.normal: "inset_shadow.png";
315 image.border: 5 5 7 3;
316 image.middle: 0;
317 rel1.to: "bg";
318 rel2.to: "bg";
319 fill.smooth: 0;
320 color: 255 255 255 128;
321 }
322 }
323 part { name: "elm.swallow.overlay"; type: SWALLOW;
324 clip_to: "clipper";
325 description { state: "default" 0.0;
326 rel1.offset: 1 1;
327 rel2.offset: -2 -2;
328 }
329 }
330 part { name: "glow";
331 mouse_events: 0;
332 description { state: "default" 0.0;
333 rel1.to: "bg";
334 rel2.to: "bg";
335 image.normal: "bg_glow_in.png";
336 image.border: 7 7 7 7;
337 image.middle: 0;
338 fill.smooth: 0;
339 color: 255 255 255 0;
340 }
341 description { state: "focused" 0.0;
342 inherit: "default" 0.0;
343 color: 255 255 255 255;
344 }
345 description { state: "focused2" 0.0;
346 inherit: "default" 0.0;
347 color: 255 255 255 64;
348 }
349 }
350 }
351 programs {
352 program {
353 signal: "elm,action,focus_highlight,show"; source: "elm";
354 action: STATE_SET "focused" 0.0;
355 target: "glow";
356 after: "focus_in2";
357 }
358 program { name: "focus_in2";
359 action: STATE_SET "focused2" 0.0;
360 transition: DECELERATE 0.5;
361 target: "glow";
362 }
363 program {
364 signal: "elm,action,focus_highlight,hide"; source: "elm";
365 action: STATE_SET "default" 0.0;
366 transition: DECELERATE 0.3;
367 target: "glow";
368 }
369 program { name: "validation_fail";
370 signal: "validation,default,fail";
371 source: "elm";
372 action: STATE_SET "fail" 0.0;
373 target: "validation_glow";
374 }
375 program { name: "validation_pass";
376 signal: "validation,default,pass";
377 source: "elm";
378 action: STATE_SET "pass" 0.0;
379 target: "validation_glow";
380 }
381 program { name: "validation_off";
382 signal: "validation,default";
383 source: "elm";
384 action: STATE_SET "default" 0.0;
385 target: "validation_glow";
386 }
387 }
7} 388}
8 389
9group { "efl/text/cursor"; 390group { "efl/text/cursor";
10 inherit: "elm/entry/cursor/default"; 391 min: 1 0;
11 alias: "efl/text/single/cursor"; 392 images.image: "white_bar_vert_glow.png" COMP;
12 alias: "efl/text/charwrap/cursor"; 393 parts {
13 alias: "efl/text/mixedwrap/cursor"; 394 part { name: "cursor"; mouse_events: 0;
14 alias: "efl/text/nowrap/cursor"; 395 clip_to: "clipper";
15 alias: "efl/text/noedit/cursor"; 396 description { state: "default" 0.0;
16 alias: "efl/text/single-noedit/cursor"; 397 rel1.offset: -4 -4;
17 alias: "efl/text/noedit-charwrap/cursor"; 398 rel2.offset: 3 3;
18 alias: "efl/text/noedit-mixedwrap/cursor"; 399 image.normal: "white_bar_vert_glow.png";
19 alias: "efl/text/nowrap-noedit/cursor"; 400 image.border: 4 4 4 4;
401 fill.smooth: 0;
402 color: 255 255 255 0;
403 color_class: "entry_cursor";
404 min: 9 10;
405 }
406 description { state: "visible" 0.0;
407 inherit: "default" 0.0;
408 color: 255 255 255 255;
409 }
410 }
411 part { name: "clipper"; type: RECT;
412 description { state: "default" 0.0;
413 rel1.to: "cursor";
414 rel2.to: "cursor";
415 fixed: 1 1;
416 }
417 description { state: "hidden" 0.0;
418 inherit: "default" 0.0;
419 visible: 0;
420 }
421 }
422 }
423 programs {
424 program {
425 signal: "selection,changed"; source: "elm.text";
426 action: STATE_SET "hidden" 0.0;
427 target: "clipper";
428 }
429 program {
430 signal: "selection,cleared"; source: "elm.text";
431 action: STATE_SET "default" 0.0;
432 target: "clipper";
433 }
434 program {
435 signal: "selection,reset"; source: "elm.text";
436 action: STATE_SET "default" 0.0;
437 target: "clipper";
438 }
439 program {
440 signal: "elm,action,focus"; source: "elm";
441 action: ACTION_STOP;
442 target: "cursor_show";
443 target: "cursor_hide";
444 target: "cursor_show_timer";
445 target: "cursor_hide_timer";
446 after: "cursor_show";
447 }
448 program {
449 signal: "elm,action,unfocus"; source: "elm";
450 action: ACTION_STOP;
451 target: "cursor_show";
452 target: "cursor_hide";
453 target: "cursor_show_timer";
454 target: "cursor_hide_timer";
455 after: "cursor_hide_stop";
456 }
457 program {
458 signal: "elm,action,show,cursor"; source: "elm";
459 action: ACTION_STOP;
460 target: "cursor_show";
461 target: "cursor_hide";
462 target: "cursor_show_timer";
463 target: "cursor_hide_timer";
464 after: "cursor_show";
465 }
466 program { name: "cursor_hide_stop";
467 action: STATE_SET "default" 0.0;
468 target: "cursor";
469 }
470 program { name: "cursor_show";
471 action: STATE_SET "visible" 0.0;
472 target: "cursor";
473 after: "cursor_show_timer";
474 }
475 program { name: "cursor_hide";
476 action: STATE_SET "default" 0.0;
477 target: "cursor";
478 transition: SINUSOIDAL 0.2;
479 after: "cursor_hide_timer";
480 }
481 program { name: "cursor_show_timer";
482 in: 0.5 0.0;
483 after: "cursor_hide";
484 }
485 program { name: "cursor_hide_timer";
486 in: 0.2 0.0;
487 after: "cursor_show";
488 }
489 }
20} 490}
21 491
22group { "efl/text/selection"; 492group { "efl/text/selection";
23 inherit: "elm/entry/selection/default"; 493 parts {
24 alias: "efl/text/single/selection"; 494 part { name: "base"; type: RECT;
25 alias: "efl/text/charwrap/selection"; 495 description { state: "default" 0.0;
26 alias: "efl/text/mixedwrap/selection"; 496 color: 51 153 255 255;
27 alias: "efl/text/nowrap/selection"; 497 }
28 alias: "efl/text/noedit/selection"; 498 }
29 alias: "efl/text/single-noedit/selection"; 499 }
30 alias: "efl/text/noedit-charwrap/selection";
31 alias: "efl/text/noedit-mixedwrap/selection";
32 alias: "efl/text/nowrap-noedit/selection";
33} 500}
34 501
35group { "efl/text/anchor"; 502group { "efl/text/anchor";
36 inherit: "elm/entry/anchor/default"; 503 images.image: "horizontal_separated_bar_small_glow.png" COMP;
37 alias: "efl/text/single/anchor"; 504 parts {
38 alias: "efl/text/charwrap/anchor"; 505 part { name: "bar";
39 alias: "efl/text/mixedwrap/anchor"; 506 description { state: "default" 0.0;
40 alias: "efl/text/nowrap/anchor"; 507 image.normal: "horizontal_separated_bar_small_glow.png";
41 alias: "efl/text/noedit/anchor"; 508 image.border: 4 4 4 4;
42 alias: "efl/text/single-noedit/anchor"; 509 fill.smooth: 0;
43 alias: "efl/text/noedit-charwrap/anchor"; 510 fixed: 0 1;
44 alias: "efl/text/noedit-mixedwrap/anchor"; 511 rel1.relative: 0.0 1.0;
45 alias: "efl/text/nowrap-noedit/anchor"; 512 rel1.offset: -3 -5;
513 rel2.offset: 2 4;
514 }
515 }
516 }
46} 517}
47 518
48group { "efl/text"; 519group { "efl/text";
49 inherit: "elm/entry/base/default";
50 alias: "efl/text/mixedwrap";
51 alias: "efl/text/charwrap";
52 alias: "efl/text/nowrap";
53 alias: "efl/text/single";
54 alias: "efl/text/single-noedit";
55 alias: "efl/text/noedit";
56 alias: "efl/text/noedit-mixedwrap";
57 alias: "efl/text/noedit-charwrap";
58 alias: "efl/text/nowrap-noedit";
59 alias: "efl/text/password";
60 sounds { 520 sounds {
61 sample { name: "key-tap1" LOSSY 64; 521 sample { name: "key-tap1" LOSSY 64;
62 source: "kbd-tap.wav"; 522 source: "kbd-tap.wav";
@@ -74,8 +534,12 @@ group { "efl/text";
74 source: "kbd-tap5.wav"; 534 source: "kbd-tap5.wav";
75 } 535 }
76 } 536 }
77 537 styles {
78// data.item: "context_menu_orientation" "horizontal"; 538 style { name: "efl_ui_text_guide_style";
539 base: "font="FN" font_size=10 color=#000000 style=shadow,bottom shadow_color=#ffffff19 wrap=word text_class=entry_guide_text color_class=entry_guide_text left_margin=2 right_margin=2 ellipsis=0.0";
540 DISABLED_TEXTBLOCK_TAGS
541 }
542 }
79 parts { 543 parts {
80 part { name: "elm.swallow.background"; type: SWALLOW; 544 part { name: "elm.swallow.background"; type: SWALLOW;
81 description { state: "default" 0.0; 545 description { state: "default" 0.0;
@@ -83,19 +547,23 @@ group { "efl/text";
83 rel2.offset: -2 -2; 547 rel2.offset: -2 -2;
84 } 548 }
85 } 549 }
550 part { name: "elm.guide"; type: TEXTBLOCK; mouse_events: 0;
551 scale: 1;
552 description { state: "default" 0.0;
553 rel1.to: "elm.text";
554 rel2.to: "elm.text";
555 text { style: "efl_ui_text_guide_style";
556 min: 0 1;
557 align: 0.0 0.0;
558 }
559 }
560 description { state: "hidden" 0.0;
561 inherit: "default" 0.0;
562 visible: 0;
563 }
564 }
86 part { name: "elm.text"; type: SWALLOW; 565 part { name: "elm.text"; type: SWALLOW;
87 scale: 1; 566 scale: 1;
88 entry_mode: EDITABLE;
89 select_mode: DEFAULT;
90// select_mode: EXPLICIT;
91 cursor_mode: BEFORE;
92 multiline: 1;
93 source: "efl/text/selection"; // selection under
94// source2: "X"; // selection over
95// source3: "X"; // cursor under
96 source4: "efl/text/cursor"; // cursorover
97// source5: "efl/text/anchor"; // anchor under
98 source6: "efl/text/anchor"; // anchor over
99 description { state: "default" 0.0; 567 description { state: "default" 0.0;
100 /* we gotta use 0 0 here, because of scrolled entries */ 568 /* we gotta use 0 0 here, because of scrolled entries */
101 fixed: 0 0; 569 fixed: 0 0;
@@ -162,44 +630,164 @@ group { "efl/text";
162} 630}
163 631
164group { "efl/text/magnifier"; 632group { "efl/text/magnifier";
165 inherit: "elm/entry/magnifier/default"; 633 images.image: "frame_rounded.png" COMP;
166 alias: "efl/text/single/magnifier"; 634 parts {
167 alias: "efl/text/charwrap/magnifier"; 635 part { name: "bg"; type: RECT; mouse_events: 0;
168 alias: "efl/text/mixedwrap/magnifier"; 636 description { state: "default" 0.0;
169 alias: "efl/text/nowrap/magnifier"; 637 rel1.offset: 10 10;
170 alias: "efl/text/noedit/magnifier"; 638 rel1.to: "over";
171 alias: "efl/text/single-noedit/magnifier"; 639 rel2.offset: -11 -11;
172 alias: "efl/text/noedit-charwrap/magnifier"; 640 rel2.to: "over";
173 alias: "efl/text/noedit-mixedwrap/magnifier"; 641 color: 48 48 48 255;
174 alias: "efl/text/nowrap-noedit/magnifier"; 642 }
643 description { state: "hidden" 0.0;
644 inherit: "default" 0.0;
645 visible: 0;
646 }
647 }
648 part { name: "elm.swallow.content"; type: SWALLOW; mouse_events: 0;
649 description { state: "default" 0.0;
650 rel1.offset: 10 10;
651 rel1.to: "over";
652 rel2.offset: -11 -11;
653 rel2.to: "over";
654 }
655 description { state: "hidden" 0.0;
656 inherit: "default" 0.0;
657 visible: 0;
658 }
659 }
660 part { name: "over"; mouse_events: 0;
661 scale: 1;
662 description { state: "default" 0.0;
663 min: 128 64;
664 align: 0 0;
665 image.normal: "frame_rounded.png";
666 image.border: 14 14 14 14;
667 image.middle: 0;
668 fill.smooth: 0;
669 }
670 description { state: "hidden" 0.0;
671 inherit: "default" 0.0;
672 visible: 0;
673 }
674 }
675 }
676 programs {
677 program { name: "magnifier_show";
678 signal: "elm,action,show,magnifier"; source: "elm";
679 action: STATE_SET "default" 0.0;
680 target: "elm.swallow.content";
681 target: "bg";
682 target: "over";
683 }
684 program { name: "magnifier_hide";
685 signal: "elm,action,hide,magnifier"; source: "elm";
686 action: STATE_SET "hidden" 0.0;
687 target: "elm.swallow.content";
688 target: "bg";
689 target: "over";
690 }
691 }
175} 692}
176 693
177group { "efl/text/handler/start"; 694group { "efl/text/handler/start";
178 inherit: "elm/entry/handler/start/default"; 695 images.image: "handle_pick_up_left.png" COMP;
179 alias: "efl/text/single/handler/start"; 696 parts {
180 alias: "efl/text/charwrap/handler/start"; 697 part { name: "base"; mouse_events: 0;
181 alias: "efl/text/mixedwrap/handler/start"; 698 scale: 1;
182 alias: "efl/text/nowrap/handler/start"; 699 description { state: "default" 0.0;
183 alias: "efl/text/noedit/handler/start"; 700 min: 21 27; // 42 54
184 alias: "efl/text/single-noedit/handler/start"; 701 image.normal: "handle_pick_up_left.png";
185 alias: "efl/text/noedit-charwrap/handler/start"; 702 align: (29/42) (11/54);
186 alias: "efl/text/noedit-mixedwrap/handler/start"; 703 color_class: "entry_selection_handler";
187 alias: "efl/text/nowrap-noedit/handler/start"; 704 visible: 0;
705 }
706 description { state: "visible" 0.0;
707 inherit: "default" 0.0;
708 visible: 1;
709 }
710 }
711 part { name: "event"; type: RECT;
712 scale: 1;
713 description { state: "default" 0.0;
714 color: 0 0 0 0;
715 rel1.to: "base";
716 rel2.to: "base";
717 min: 32 32;
718 visible: 0;
719 }
720 description { state: "visible" 0.0;
721 inherit: "default" 0.0;
722 visible: 1;
723 }
724 }
725 }
726 programs {
727 program {
728 signal: "elm,handler,show"; source: "elm";
729 action: STATE_SET "visible" 0.0;
730 target: "base";
731 target: "event";
732 }
733 program {
734 signal: "elm,handler,hide"; source: "elm";
735 action: STATE_SET "default" 0.0;
736 target: "base";
737 target: "event";
738 }
739 }
188} 740}
189 741
190group { "efl/text/handler/end"; 742group { "efl/text/handler/end";
191 inherit: "elm/entry/handler/end/default"; 743 images.image: "handle_pick_up_right.png" COMP;
192 alias: "efl/text/single/handler/end"; 744 parts {
193 alias: "efl/text/charwrap/handler/end"; 745 part { name: "base"; mouse_events: 0;
194 alias: "efl/text/mixedwrap/handler/end"; 746 scale: 1;
195 alias: "efl/text/nowrap/handler/end"; 747 description { state: "default" 0.0;
196 alias: "efl/text/noedit/handler/end"; 748 min: 21 27; // 42 54
197 alias: "efl/text/single-noedit/handler/end"; 749 image.normal: "handle_pick_up_right.png";
198 alias: "efl/text/noedit-charwrap/handler/end"; 750 align: (12/42) (11/54);
199 alias: "efl/text/noedit-mixedwrap/handler/end"; 751 color_class: "entry_selection_handler";
200 alias: "efl/text/nowrap-noedit/handler/end"; 752 visible: 0;
753 }
754 description { state: "visible" 0.0;
755 inherit: "default" 0.0;
756 visible: 1;
757 }
758 }
759 part { name: "event"; type: RECT;
760 scale: 1;
761 description { state: "default" 0.0;
762 color: 0 0 0 0;
763 rel1.to: "base";
764 rel2.to: "base";
765 min: 32 32;
766 visible: 0;
767 }
768 description { state: "visible" 0.0;
769 inherit: "default" 0.0;
770 visible: 1;
771 }
772 }
773 }
774 programs {
775 program {
776 signal: "elm,handler,show"; source: "elm";
777 action: STATE_SET "visible" 0.0;
778 target: "base";
779 target: "event";
780 }
781 program {
782 signal: "elm,handler,hide"; source: "elm";
783 action: STATE_SET "default" 0.0;
784 target: "base";
785 target: "event";
786 }
787 }
201} 788}
202 789
790
203/////////////////////////////////////////////////////////////////////////////// 791///////////////////////////////////////////////////////////////////////////////
204// emoticon images from: 792// emoticon images from:
205// Tanya - Latvia 793// Tanya - Latvia
diff --git a/data/elementary/themes/edc/elm/entry.edc b/data/elementary/themes/edc/elm/entry.edc
index bf881daf5b..189bf968d7 100644
--- a/data/elementary/themes/edc/elm/entry.edc
+++ b/data/elementary/themes/edc/elm/entry.edc
@@ -519,7 +519,7 @@ group { name: "elm/entry/anchor/default";
519} 519}
520 520
521group { name: "elm/entry/base/default"; 521group { name: "elm/entry/base/default";
522 sounds { 522 sounds {
523 sample { name: "key-tap1" LOSSY 64; 523 sample { name: "key-tap1" LOSSY 64;
524 source: "kbd-tap.wav"; 524 source: "kbd-tap.wav";
525 } 525 }
@@ -1194,110 +1194,6 @@ group { name: "elm/entry/handler/end/default";
1194 } 1194 }
1195} 1195}
1196 1196
1197group { name: "elm/efl_ui_text/base/default";
1198 sounds {
1199 sample { name: "key-tap1" LOSSY 64;
1200 source: "kbd-tap.wav";
1201 }
1202 sample { name: "key-tap2" LOSSY 64;
1203 source: "kbd-tap2.wav";
1204 }
1205 sample { name: "key-tap3" LOSSY 64;
1206 source: "kbd-tap3.wav";
1207 }
1208 sample { name: "key-tap4" LOSSY 64;
1209 source: "kbd-tap4.wav";
1210 }
1211 sample { name: "key-tap5" LOSSY 64;
1212 source: "kbd-tap5.wav";
1213 }
1214 }
1215
1216// data.item: "context_menu_orientation" "horizontal";
1217 parts {
1218 part { name: "elm.swallow.background"; type: SWALLOW;
1219 description { state: "default" 0.0;
1220 rel1.offset: 1 1;
1221 rel2.offset: -2 -2;
1222 }
1223 }
1224 part { name: "elm.text"; type: SWALLOW;
1225 scale: 1;
1226 entry_mode: EDITABLE;
1227 select_mode: DEFAULT;
1228// select_mode: EXPLICIT;
1229 cursor_mode: BEFORE;
1230 multiline: 1;
1231 source: "elm/entry/selection/default"; // selection under
1232// source2: "X"; // selection over
1233// source3: "X"; // cursor under
1234 source4: "elm/entry/cursor/default"; // cursorover
1235// source5: "elm/entry/anchor/default"; // anchor under
1236 source6: "elm/entry/anchor/default"; // anchor over
1237 description { state: "default" 0.0;
1238 /* we gotta use 0 0 here, because of scrolled entries */
1239 fixed: 0 0;
1240 rel1.offset: 2 2;
1241 rel2.offset: -3 -3;
1242 }
1243 description { state: "disabled" 0.0;
1244 inherit: "default" 0.0;
1245 }
1246 }
1247 }
1248 programs {
1249 program {
1250 signal: "load"; source: "";
1251 action: FOCUS_SET;
1252 target: "elm.text";
1253 }
1254 program {
1255 signal: "elm,state,disabled"; source: "elm";
1256 action: STATE_SET "disabled" 0.0;
1257 target: "elm.text";
1258 }
1259 program {
1260 signal: "elm,state,enabled"; source: "elm";
1261 action: STATE_SET "default" 0.0;
1262 target: "elm.text";
1263 }
1264 #if 0
1265 program {
1266 signal: "elm,guide,disabled"; source: "elm";
1267 action: STATE_SET "hidden" 0.0;
1268 target: "elm.guide";
1269 }
1270 program {
1271 signal: "elm,guide,enabled"; source: "elm";
1272 action: STATE_SET "default" 0.0;
1273 target: "elm.guide";
1274 }
1275 #endif
1276 program { name: "key-down";
1277 signal: "entry,keydown"; source: "elm.text";
1278 script {
1279 new buf[32];
1280 snprintf(buf, 31, "key-down%i", (rand() % 5) + 1);
1281 run_program(get_program_id(buf));
1282 }
1283 }
1284 program { name: "key-down1";
1285 action: PLAY_SAMPLE "key-tap1" 1.0 INPUT;
1286 }
1287 program { name: "key-down2";
1288 action: PLAY_SAMPLE "key-tap2" 1.0 INPUT;
1289 }
1290 program { name: "key-down3";
1291 action: PLAY_SAMPLE "key-tap3" 1.0 INPUT;
1292 }
1293 program { name: "key-down4";
1294 action: PLAY_SAMPLE "key-tap4" 1.0 INPUT;
1295 }
1296 program { name: "key-down5";
1297 action: PLAY_SAMPLE "key-tap5" 1.0 INPUT;
1298 }
1299 }
1300}
1301/////////////////////////////////////////////////////////////////////////////// 1197///////////////////////////////////////////////////////////////////////////////
1302// emoticon images from: 1198// emoticon images from:
1303// Tanya - Latvia 1199// Tanya - Latvia