summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorHermet Park <chuneon.park@samsung.com>2021-03-03 09:59:46 +0900
committerHermet Park <chuneon.park@samsung.com>2021-03-03 09:59:46 +0900
commitea61e95e4cb0d8567300400373da290daa86d92f (patch)
tree7c39b1f49d202eec0159003a756e93c35b5773c3 /data
parentec2356e9fbbdda2806c380871a4e95118b23844a (diff)
parentfd18561a40b2f8d5fe0886bbf153a463af551e25 (diff)
Merge branch 'feature/themes/flat' into devs/hermet/lottie
Diffstat (limited to 'data')
-rw-r--r--data/elementary/themes/default.edc12
-rw-r--r--data/elementary/themes/edc/about-theme.edc4
-rw-r--r--data/elementary/themes/edc/comp.edc1
-rw-r--r--data/elementary/themes/edc/comp_compat.edc11
-rw-r--r--data/elementary/themes/edc/efl/calendar.edc531
-rw-r--r--data/elementary/themes/edc/efl/check.edc1097
-rw-r--r--data/elementary/themes/edc/efl/cursor.edc6
-rw-r--r--data/elementary/themes/edc/efl/datepicker.edc171
-rw-r--r--data/elementary/themes/edc/efl/focus.edc143
-rw-r--r--data/elementary/themes/edc/efl/frame.edc133
-rw-r--r--data/elementary/themes/edc/efl/grid.edc340
-rw-r--r--data/elementary/themes/edc/efl/group_item.edc100
-rw-r--r--data/elementary/themes/edc/efl/image_zoomable.edc99
-rw-r--r--data/elementary/themes/edc/efl/text.edc17
-rw-r--r--data/elementary/themes/edc/elm/actionslider.edc6
-rw-r--r--data/elementary/themes/edc/elm/button.edc3
-rw-r--r--data/elementary/themes/edc/elm/calendar.edc1
-rw-r--r--data/elementary/themes/edc/elm/check.edc9
-rw-r--r--data/elementary/themes/edc/elm/colorclass.edc1
-rw-r--r--data/elementary/themes/edc/elm/entry.edc34
-rw-r--r--data/elementary/themes/edc/elm/frame.edc25
-rw-r--r--data/elementary/themes/edc/elm/radio.edc2
-rw-r--r--data/elementary/themes/edc/elm/slider.edc792
-rw-r--r--data/elementary/themes/edc/elm/thumb.edc4
-rw-r--r--data/elementary/themes/edc/init.edc5
-rw-r--r--data/elementary/themes/img/about-flat-bg.pngbin0 -> 109318 bytes
-rw-r--r--data/elementary/themes/img/about-flat-bg.svg148
-rw-r--r--data/elementary/themes/img/gesture.svg98
-rw-r--r--data/elementary/themes/img/ic/gesture-040.pngbin1147 -> 1362 bytes
-rw-r--r--data/elementary/themes/img/ic/gesture-080.pngbin2351 -> 2866 bytes
-rw-r--r--data/elementary/themes/img/ic/gesture-160.pngbin4710 -> 6002 bytes
-rw-r--r--data/elementary/themes/img/ic/keyboard-040.pngbin567 -> 481 bytes
-rw-r--r--data/elementary/themes/img/ic/keyboard-080.pngbin795 -> 846 bytes
-rw-r--r--data/elementary/themes/img/ic/keyboard-160.pngbin1395 -> 1534 bytes
-rw-r--r--data/elementary/themes/img/ic/keyboard-hand-040.pngbin1384 -> 936 bytes
-rw-r--r--data/elementary/themes/img/ic/keyboard-hand-080.pngbin3089 -> 1919 bytes
-rw-r--r--data/elementary/themes/img/ic/keyboard-hand-160.pngbin7021 -> 3662 bytes
-rw-r--r--data/elementary/themes/img/ic/phone-040.pngbin1246 -> 896 bytes
-rw-r--r--data/elementary/themes/img/ic/phone-080.pngbin2871 -> 1935 bytes
-rw-r--r--data/elementary/themes/img/ic/phone-160.pngbin6555 -> 4272 bytes
-rw-r--r--data/elementary/themes/img/keyboard-hand.svg559
-rw-r--r--data/elementary/themes/img/keyboard.svg450
-rw-r--r--data/elementary/themes/img/phone.svg221
-rw-r--r--data/elementary/themes/macros.edc100
-rw-r--r--data/elementary/themes/snd/wood-tap.wavbin22320 -> 22320 bytes
-rw-r--r--data/elementary/themes/snd/wood-tap2.wavbin17964 -> 17964 bytes
46 files changed, 1472 insertions, 3651 deletions
diff --git a/data/elementary/themes/default.edc b/data/elementary/themes/default.edc
index 14a5f69e31..ecc4db9884 100644
--- a/data/elementary/themes/default.edc
+++ b/data/elementary/themes/default.edc
@@ -10,6 +10,18 @@ data.item: "version" "119";
10data.item: "efl_theme_base" "dark"; 10data.item: "efl_theme_base" "dark";
11 11
12collections { 12collections {
13
14sounds {
15 sample { name: "splash" LOSSY 256; source: "splash.wav"; }
16 sample { name: "wood-tap1" LOSSY 64; source: "wood-tap.wav"; }
17 sample { name: "wood-tap2" LOSSY 64; source: "wood-tap2.wav"; }
18 sample { name: "key-tap1" LOSSY 64; source: "kbd-tap.wav"; }
19 sample { name: "key-tap2" LOSSY 64; source: "kbd-tap2.wav"; }
20 sample { name: "key-tap3" LOSSY 64; source: "kbd-tap3.wav"; }
21 sample { name: "key-tap4" LOSSY 64; source: "kbd-tap4.wav"; }
22 sample { name: "key-tap5" LOSSY 64; source: "kbd-tap5.wav"; }
23}
24
13#include "ic.edc" 25#include "ic.edc"
14 26
15#include "fonts.edc" 27#include "fonts.edc"
diff --git a/data/elementary/themes/edc/about-theme.edc b/data/elementary/themes/edc/about-theme.edc
index e6868eb30c..36aa24a5fd 100644
--- a/data/elementary/themes/edc/about-theme.edc
+++ b/data/elementary/themes/edc/about-theme.edc
@@ -2,7 +2,7 @@ group { name: "e/theme/about";
2 // data.item: "borderless" "1"; 2 // data.item: "borderless" "1";
3 // data.item: "shaped" "1"; 3 // data.item: "shaped" "1";
4// images.image: "check_fill.png" COMP; 4// images.image: "check_fill.png" COMP;
5 images.image: "clouds.jpg" LOSSY 99; 5 images.image: "about-flat-bg.png" COMP;
6 min: 220 320; 6 min: 220 320;
7 parts { 7 parts {
8 part { name: "sizer"; type: SPACER; 8 part { name: "sizer"; type: SPACER;
@@ -35,7 +35,7 @@ group { name: "e/theme/about";
35 part { name: "image"; 35 part { name: "image";
36 description { state: "default" 0.0; 36 description { state: "default" 0.0;
37 fixed: 1 1; 37 fixed: 1 1;
38 image.normal: "clouds.jpg"; 38 image.normal: "about-flat-bg.png";
39 aspect: 1.0 1.0; aspect_preference: NONE; 39 aspect: 1.0 1.0; aspect_preference: NONE;
40 } 40 }
41 } 41 }
diff --git a/data/elementary/themes/edc/comp.edc b/data/elementary/themes/edc/comp.edc
index f325b9621f..f7e3e0be99 100644
--- a/data/elementary/themes/edc/comp.edc
+++ b/data/elementary/themes/edc/comp.edc
@@ -254,6 +254,7 @@ group { name: "e/comp/frame/default";
254 description { state: "focused" 0.0; 254 description { state: "focused" 0.0;
255 inherit; 255 inherit;
256 color_class: "comp_focus_color"; 256 color_class: "comp_focus_color";
257 color: 255 255 255 255;
257 } 258 }
258 } 259 }
259 part { name: "e.swallow.content"; type: SWALLOW; 260 part { name: "e.swallow.content"; type: SWALLOW;
diff --git a/data/elementary/themes/edc/comp_compat.edc b/data/elementary/themes/edc/comp_compat.edc
index 3cf0364730..ffc9990b37 100644
--- a/data/elementary/themes/edc/comp_compat.edc
+++ b/data/elementary/themes/edc/comp_compat.edc
@@ -45,8 +45,7 @@ group { name: "e/comp/border/default";
45 mouse_events: 0; 45 mouse_events: 0;
46 description { state: "default" 0.0; 46 description { state: "default" 0.0;
47 color_class: "comp_alpha"; 47 color_class: "comp_alpha";
48 rel1.to: "clipper"; 48 rel.to: "clipper";
49 rel2.to: "clipper";
50 } 49 }
51 } 50 }
52 part { name: "focus-clipper"; 51 part { name: "focus-clipper";
@@ -55,20 +54,18 @@ group { name: "e/comp/border/default";
55 mouse_events: 0; 54 mouse_events: 0;
56 description { state: "default" 0.0; 55 description { state: "default" 0.0;
57 color_class: "comp_focus-out_color"; 56 color_class: "comp_focus-out_color";
58 rel1.to: "clipper"; 57 rel.to: "clipper";
59 rel2.to: "clipper";
60 } 58 }
61 description { state: "focused" 0.0; 59 description { state: "focused" 0.0;
62 inherit: "default" 0.0; 60 inherit: "default" 0.0;
63 color_class: ""; 61 color_class: "comp_focus_color";
64 color: 255 255 255 255; 62 color: 255 255 255 255;
65 } 63 }
66 } 64 }
67 part { name: "e.swallow.content"; type: SWALLOW; 65 part { name: "e.swallow.content"; type: SWALLOW;
68 clip_to: "focus-clipper"; 66 clip_to: "focus-clipper";
69 description { state: "default" 0.0; 67 description { state: "default" 0.0;
70 rel1.to: "shower"; 68 rel.to: "shower";
71 rel2.to: "shower";
72 } 69 }
73 } 70 }
74 } 71 }
diff --git a/data/elementary/themes/edc/efl/calendar.edc b/data/elementary/themes/edc/efl/calendar.edc
index 6afbeda728..79f81c218d 100644
--- a/data/elementary/themes/edc/efl/calendar.edc
+++ b/data/elementary/themes/edc/efl/calendar.edc
@@ -1,12 +1,21 @@
1#define CIT_STYLE\ 1#define CIT_STYLES\
2 style { name: "efl_ui_calendar_date_style";\ 2 style { name: "efl_ui_calendar_date_style";\
3 base: "font="FN" font_size=10 color=#ffffff style=shadow,bottom shadow_color=#00000080 align=center text_class=calendar_day_text color_class=calendar_day_text";\ 3 base: "font="FN" font_size=10 color=#a0a0a0 align=center text_class=calendar_day_text";\
4 }\
5 style { name: "efl_ui_calendar_date_holiday_style";\
6 base: "font="FN" font_size=10 color=#3399ff align=center text_class=calendar_day_text_holiday";\
4 }\ 7 }\
5 style { name: "efl_ui_calendar_date_today_style";\ 8 style { name: "efl_ui_calendar_date_today_style";\
6 base: "font="FN" font_size=10 color=#3399ff style=glow glow_color=#3399ff18 align=center text_class=calendar_day_text_today color_class=calendar_day_text_today";\ 9 base: "font="FN" font_size=10 color=#ffffff align=center text_class=calendar_day_text_today";\
7 }\ 10 }\
8 style { name: "efl_ui_calendar_date_disabled_style";\ 11 style { name: "efl_ui_calendar_date_disabled_style";\
9 base: "font="FN" font_size=10 color=#151515 style=shadow,bottom shadow_color=#ffffffc0 align=center text_class=calendar_day_text_disabled text_class=calendar_day_text_disabled";\ 12 base: "font="FN" font_size=10 color=#282828 align=center text_class=calendar_day_text_disabled";\
13 }\
14 style { name: "efl_ui_calendar_date_weekend1_style";\
15 base: "font="FN" font_size=10 color=#3399ff align=center text_class=calendar_day_text_weekend1";\
16 }\
17 style { name: "efl_ui_calendar_date_weekend2_style";\
18 base: "font="FN" font_size=10 color=#3399ff align=center text_class=calendar_day_text_weekend2";\
10 }\ 19 }\
11 20
12#define CAL_SPIN(_sufix, _text, _relative)\ 21#define CAL_SPIN(_sufix, _text, _relative)\
@@ -21,8 +30,8 @@
21 offset: 0 -1;\ 30 offset: 0 -1;\
22 }\ 31 }\
23 align: 0.0 0.5;\ 32 align: 0.0 0.5;\
24 min: 15 15;\ 33 min: 25 25;\
25 max: 15 15;\ 34 max: 25 25;\
26 }\ 35 }\
27 }\ 36 }\
28 part { name: "right_bt"#_sufix; type: RECT;\ 37 part { name: "right_bt"#_sufix; type: RECT;\
@@ -36,139 +45,110 @@
36 offset: -1 -1;\ 45 offset: -1 -1;\
37 }\ 46 }\
38 align: 1.0 0.5;\ 47 align: 1.0 0.5;\
39 min: 15 15;\ 48 min: 25 25;\
40 max: 15 15;\ 49 max: 25 25;\
41 color: 0 0 0 0;\ 50 color: 0 0 0 0;\
42 }\ 51 }\
43 }\ 52 }\
44 part { name: "efl.calendar.button"#_sufix".left";\ 53 part { name: "efl.calendar.button"#_sufix".left"; type: SWALLOW;\
45 type: SWALLOW;\
46 scale: 1;\ 54 scale: 1;\
47 description { state: "default" 0.0;\ 55 description { state: "default" 0.0;\
48 fixed: 1 1;\ 56 fixed: 1 1;\
49 rel1.to: "left_bt"#_sufix;\ 57 rel.to: "left_bt"#_sufix;\
50 rel2.to: "left_bt"#_sufix;\ 58 min: 15 15;\
59 max: 15 15;\
51 }\ 60 }\
52 description { state: "rtl" 0.0;\ 61 description { state: "rtl" 0.0;\
53 inherit: "default" 0.0;\ 62 inherit: "default" 0.0;\
54 rel1.to: "right_bt"#_sufix;\ 63 rel.to: "right_bt"#_sufix;\
55 rel2.to: "right_bt"#_sufix;\
56 }\ 64 }\
57 }\ 65 }\
58 part { name: "efl.calendar.button"#_sufix".right";\ 66 part { name: "efl.calendar.button"#_sufix".right"; type: SWALLOW;\
59 type: SWALLOW;\
60 scale: 1;\ 67 scale: 1;\
61 description { state: "default" 0.0;\ 68 description { state: "default" 0.0;\
62 fixed: 1 1;\ 69 fixed: 1 1;\
63 rel1.to: "right_bt"#_sufix;\ 70 rel.to: "right_bt"#_sufix;\
64 rel2.to: "right_bt"#_sufix;\ 71 min: 15 15;\
72 max: 15 15;\
65 }\ 73 }\
66 description { state: "rtl" 0.0;\ 74 description { state: "rtl" 0.0;\
67 inherit: "default" 0.0;\ 75 inherit: "default" 0.0;\
68 rel1.to: "left_bt"#_sufix;\ 76 rel.to: "left_bt"#_sufix;\
69 rel2.to: "left_bt"#_sufix;\
70 }\ 77 }\
71 }\ 78 }\
72 part { name: #_text; type: TEXT; mouse_events: 0;\ 79 part { name: #_text; type: TEXT; mouse_events: 0;\
73 effect: SHADOW BOTTOM; \
74 scale: 1;\ 80 scale: 1;\
75 description { state: "default" 0.0;\ 81 description { state: "default" 0.0;\
76 fixed: 1 1;\ 82 fixed: 1 1;\
77 rel1 { relative: 1.0 0.0;\ 83 rel1 { relative: 1.0 0.0;\
78 to: "left_bt"#_sufix;\ 84 to: "left_bt"#_sufix;\
85 offset: 8 8;\
79 }\ 86 }\
80 rel2 { relative: 0.0 1.0;\ 87 rel2 { relative: 0.0 1.0;\
81 to: "right_bt"#_sufix;\ 88 to: "right_bt"#_sufix;\
89 offset: -9 -9;\
82 }\ 90 }\
91 offscale;\
83 text { font: FNBD; size: 10;\ 92 text { font: FNBD; size: 10;\
84 min: 0 1;\ 93 min: 0 1;\
85 text_class: "calendar_"#_text; \ 94 text_class: "calendar_"#_text; \
86 }\ 95 }\
87 color_class: "calendar_"#_text; \ 96 color: 160 160 160 255; \
88 }\ 97 }\
89 } 98 }
90 99
91#define CH(_pos) \ 100#define CH(_pos) \
92 part { name: "ch_"#_pos"_base"; type: SPACER; \ 101 part { name: "ch_"#_pos"_base"; type: SPACER; \
93 description { state: "default" 0.0; \ 102 description { state: "default" 0.0; \
94 rel1 { \ 103 rel.to: "header";\
95 relative: (_pos % 7 / 7) 0.0; \ 104 rel1.relative: (_pos % 7 / 7) 0.0; \
96 to: "header"; \ 105 rel2.relative: (_pos % 7 / 7 + 1 / 7) 1.0; \
97 } \
98 rel2 { \
99 relative: (_pos % 7 / 7 + 1 / 7) 1.0; \
100 to: "header"; \
101 } \
102 } \ 106 } \
103 } \ 107 } \
104 part { name: "efl.ch_"#_pos".text"; type: TEXT; mouse_events: 0; \ 108 part { name: "efl.ch_"#_pos".text"; type: TEXT; mouse_events: 0; \
105 effect: SHADOW BOTTOM; \
106 scale: 1; \ 109 scale: 1; \
107 clip_to: "ch_"#_pos"_clipper"; \ 110 clip_to: "ch_"#_pos"_clipper"; \
108 description { state: "default" 0.0; \ 111 description { state: "default" 0.0; \
109 rel1.to: "ch_"#_pos"_base"; \ 112 rel.to: "ch_"#_pos"_base"; \
110 rel2.to: "ch_"#_pos"_base"; \ 113 rel1.offset: 0 3; \
114 rel2.offset: -1 -4; \
115 offscale;\
111 text { font: FN; size: 8; \ 116 text { font: FN; size: 8; \
112 min: 1 1; \ 117 min: 1 1; \
113 ellipsis: -1; \ 118 ellipsis: -1; \
114 text_class: "calendar_weekday_text"; \ 119 text_class: "calendar_weekday_text"; \
115 } \ 120 } \
116 color_class: "calendar_weekday_text"; \ 121 color: 160 160 160 255; \
117 } \ 122 } \
118 } \ 123 } \
119 part { name: "ch_"#_pos"_clipper"; type: RECT; \ 124 part { name: "ch_"#_pos"_clipper"; type: RECT; \
120 description { state: "default" 0.0; \ 125 description { state: "default" 0.0; \
121 rel1.to: "ch_"#_pos"_base"; \ 126 rel.to: "ch_"#_pos"_base"; \
122 rel2.to: "ch_"#_pos"_base"; \
123 } \ 127 } \
124 } 128 }
125 129
126#define CIT(_pos) \ 130#define CIT(_pos) \
127 part { name: "cit_"#_pos"_rect"; type: SPACER; \ 131 part { name: "cit_"#_pos"_rect"; type: SPACER; \
128 description { state: "default" 0.0; \ 132 description { state: "default" 0.0; \
129 rel1 { \ 133 rel.to: "base"; \
130 relative: (_pos % 7 / 7) \ 134 rel1.relative: (_pos % 7 / 7) (_pos / 7 / 6 - _pos % 7 / 7 / 6); \
131 (_pos / 7 / 6 - _pos % 7 / 7 / 6); \ 135 rel2.relative: (_pos % 7 / 7 + 1 / 7) (_pos / 7 / 6 + 1 / 6 - _pos % 7 / 7 / 6); \
132 to: "base"; \
133 } \
134 rel2 { \
135 relative: (_pos % 7 / 7 + 1 / 7) \
136 (_pos / 7 / 6 + 1 / 6 - _pos % 7 / 7 / 6); \
137 to: "base"; \
138 } \
139 } \ 136 } \
140 } \ 137 } \
141 part { name: "cit_"#_pos"_event"; type: RECT; repeat_events: 1; \ 138 part { name: "cit_"#_pos"_event"; type: RECT; repeat_events: 1; \
142 description { state: "default" 0.0; \ 139 description { state: "default" 0.0; \
143 rel1.to: "cit_"#_pos"_rect"; \ 140 rel.to: "cit_"#_pos"_rect"; \
144 rel2.to: "cit_"#_pos"_rect"; \
145 color: 0 0 0 0; \ 141 color: 0 0 0 0; \
146 } \ 142 } \
147 } \ 143 description { state: "today" 0.0; \
148 part { name: "cit_"#_pos"_pat"; mouse_events: 0; \
149 description { state: "default" 0.0; \
150 rel1.to: "cit_"#_pos"_selected"; \
151 rel1.offset: 1 1; \
152 rel2.to: "cit_"#_pos"_selected"; \
153 rel2.offset: -2 -2; \
154 image.normal: "diagonal_stripes.png"; \
155 color: 51 153 255 25; \
156 TILED_PATTERN(240, 240) \
157 color_class: "calendar_day_selected"; \
158 visible: 0; \
159 } \
160 description { state: "selected" 0.0; \
161 inherit: "default" 0.0; \ 144 inherit: "default" 0.0; \
162 visible: 1; \ 145 color: 0 0 0 64; \
163 } \ 146 } \
164 } \ 147 } \
165 part { name: "cit_"#_pos"_selected"; mouse_events: 0; \ 148 part { name: "cit_"#_pos"_selected"; type: RECT; mouse_events: 0; \
166 description { state: "default" 0.0; \ 149 description { state: "default" 0.0; \
167 rel1.to: "cit_"#_pos"_rect"; \ 150 rel.to: "cit_"#_pos"_rect"; \
168 rel2.to: "cit_"#_pos"_rect"; \ 151 color: 51 153 255 128; \
169 image.normal: "outline.png"; \
170 image.border: 4 4 4 4; \
171 color: 51 153 255 255; \
172 visible: 0; \ 152 visible: 0; \
173 } \ 153 } \
174 description { state: "selected" 0.0; \ 154 description { state: "selected" 0.0; \
@@ -176,32 +156,13 @@
176 visible: 1; \ 156 visible: 1; \
177 } \ 157 } \
178 } \ 158 } \
179 part { name: "cit_"#_pos"_selected2"; mouse_events: 0; \ 159 part { name: "cit_"#_pos"_focus"; type: RECT; mouse_events: 0; \
180 description { state: "default" 0.0; \ 160 description { state: "default" 0.0; \
181 rel1.to: "cit_"#_pos"_rect"; \ 161 rel.to: "cit_"#_pos"_rect"; \
182 rel2.to: "cit_"#_pos"_rect"; \ 162 color: 255 153 51 128; \
183 image.normal: "outline.png"; \
184 image.border: 4 4 4 4; \
185 color: 51 153 255 255; \
186 color_class: "calendar_day_highlighted"; \
187 visible: 0; \ 163 visible: 0; \
188 } \ 164 } \
189 description { state: "highlighted" 0.0; \ 165 description { state: "selected" 0.0; \
190 inherit: "default" 0.0; \
191 visible: 1; \
192 } \
193 } \
194 part { name: "cit_"#_pos"_glow"; mouse_events: 0; \
195 description { state: "default" 0.0; \
196 rel1.to: "cit_"#_pos"_rect"; \
197 rel2.to: "cit_"#_pos"_rect"; \
198 image.normal: "box_glow.png"; \
199 image.border: 12 12 12 12; \
200 image.middle: 0; \
201 fill.smooth: 0; \
202 visible: 0; \
203 } \
204 description { state: "focused" 0.0; \
205 inherit: "default" 0.0; \ 166 inherit: "default" 0.0; \
206 visible: 1; \ 167 visible: 1; \
207 } \ 168 } \
@@ -209,11 +170,17 @@
209 part { name: "efl.cit_"#_pos".text"; type: TEXTBLOCK; mouse_events: 0; \ 170 part { name: "efl.cit_"#_pos".text"; type: TEXTBLOCK; mouse_events: 0; \
210 scale: 1; \ 171 scale: 1; \
211 description { state: "default" 0.0; \ 172 description { state: "default" 0.0; \
212 rel1.to: "cit_"#_pos"_rect"; \ 173 rel.to: "cit_"#_pos"_rect"; \
213 rel2.to: "cit_"#_pos"_rect"; \ 174 rel1.offset: 3 0; \
175 rel2.offset: -4 -1; \
214 text.style: "efl_ui_calendar_date_style"; \ 176 text.style: "efl_ui_calendar_date_style"; \
215 text.min: 1 1; \ 177 text.min: 1 1; \
216 text.ellipsis: -1; \ 178 text.ellipsis: -1; \
179 offscale; \
180 } \
181 description { state: "holiday" 0.0; \
182 inherit: "default" 0.0; \
183 text.style: "efl_ui_calendar_date_holiday_style"; \
217 } \ 184 } \
218 description { state: "today" 0.0; \ 185 description { state: "today" 0.0; \
219 inherit: "default" 0.0; \ 186 inherit: "default" 0.0; \
@@ -223,25 +190,26 @@
223 inherit: "default" 0.0; \ 190 inherit: "default" 0.0; \
224 text.style: "efl_ui_calendar_date_disabled_style"; \ 191 text.style: "efl_ui_calendar_date_disabled_style"; \
225 } \ 192 } \
193 description { state: "weekend/day1" 0.0; \
194 inherit: "default" 0.0; \
195 text.style: "efl_ui_calendar_date_weekend1_style"; \
196 } \
197 description { state: "weekend/day2" 0.0; \
198 inherit: "default" 0.0; \
199 text.style: "efl_ui_calendar_date_weekend2_style"; \
200 } \
226 } \ 201 } \
227 part { name: "cit_"#_pos"_check"; mouse_events: 0; \ 202 part { name: "cit_"#_pos"_check"; mouse_events: 0; \
228 scale: 1; \ 203 scale: 1; \
229 description { state: "default" 0.0; \ 204 description { state: "default" 0.0; \
230 fixed: 1 1; \ 205 fixed: 1 1; \
231 rel1 { \ 206 rel.to: "cit_"#_pos"_rect"; \
232 to: "cit_"#_pos"_rect"; \ 207 rel1.relative: 0.6 0.5; \
233 relative: 0.6 0.5; \ 208 min: 15 15; \
234 } \ 209 max: 15 15; \
235 rel2 { \
236 to: "cit_"#_pos"_rect"; \
237 relative: 0.6 0.5; \
238 } \
239 min: 16 16; \
240 max: 16 16; \
241 aspect: 1 1; \
242 align: 0.0 1.0;\ 210 align: 0.0 1.0;\
243 image.normal: "icon_border_remember.png"; \ 211 image.normal: "i-check"; \
244 color_class: "calendar_day_checked"; \ 212 color: 53 153 255 255; \
245 visible: 0; \ 213 visible: 0; \
246 } \ 214 } \
247 description { state: "visible" 0.0; \ 215 description { state: "visible" 0.0; \
@@ -251,8 +219,7 @@
251 } \ 219 } \
252 part { name: "efl.cit_"#_pos".access"; type: RECT; repeat_events: 1; \ 220 part { name: "efl.cit_"#_pos".access"; type: RECT; repeat_events: 1; \
253 description { state: "default" 0.0; \ 221 description { state: "default" 0.0; \
254 rel1.to: "cit_"#_pos"_event"; \ 222 rel.to: "cit_"#_pos"_event"; \
255 rel2.to: "cit_"#_pos"_event"; \
256 color: 0 0 0 0; \ 223 color: 0 0 0 0; \
257 } \ 224 } \
258 } \ 225 } \
@@ -262,7 +229,6 @@
262 signal: "cit_"#_pos",selected"; \ 229 signal: "cit_"#_pos",selected"; \
263 source: "efl"; \ 230 source: "efl"; \
264 action: STATE_SET "selected" 0.0; \ 231 action: STATE_SET "selected" 0.0; \
265 target: "cit_"#_pos"_pat"; \
266 target: "cit_"#_pos"_selected"; \ 232 target: "cit_"#_pos"_selected"; \
267 } \ 233 } \
268 program { \ 234 program { \
@@ -270,7 +236,6 @@
270 signal: "cit_"#_pos",unselected"; \ 236 signal: "cit_"#_pos",unselected"; \
271 source: "efl"; \ 237 source: "efl"; \
272 action: STATE_SET "default" 0.0; \ 238 action: STATE_SET "default" 0.0; \
273 target: "cit_"#_pos"_pat"; \
274 target: "cit_"#_pos"_selected"; \ 239 target: "cit_"#_pos"_selected"; \
275 } \ 240 } \
276 program { \ 241 program { \
@@ -281,7 +246,7 @@
281 set_int(item_focus_enabled, 1); \ 246 set_int(item_focus_enabled, 1); \
282 set_int(last_focused_item, _pos); \ 247 set_int(last_focused_item, _pos); \
283 if (get_int(win_focus_enabled) == 1) \ 248 if (get_int(win_focus_enabled) == 1) \
284 set_state(PART:"cit_"#_pos"_glow", "focused", 0.0); \ 249 set_state(PART:"cit_"#_pos"_focus", "selected", 0.0); \
285 } \ 250 } \
286 } \ 251 } \
287 program { \ 252 program { \
@@ -290,7 +255,7 @@
290 source: "efl"; \ 255 source: "efl"; \
291 script { \ 256 script { \
292 set_int(item_focus_enabled, 0); \ 257 set_int(item_focus_enabled, 0); \
293 set_state(PART:"cit_"#_pos"_glow", "default", 0.0); \ 258 set_state(PART:"cit_"#_pos"_focus", "default", 0.0); \
294 } \ 259 } \
295 } \ 260 } \
296 program { \ 261 program { \
@@ -299,6 +264,7 @@
299 source: "efl"; \ 264 source: "efl"; \
300 action: STATE_SET "today" 0.0; \ 265 action: STATE_SET "today" 0.0; \
301 target: "efl.cit_"#_pos".text"; \ 266 target: "efl.cit_"#_pos".text"; \
267 target: "cit_"#_pos"_event";\
302 } \ 268 } \
303 program { \ 269 program { \
304 name: "cit_"#_pos"_not_today"; \ 270 name: "cit_"#_pos"_not_today"; \
@@ -306,6 +272,7 @@
306 source: "efl"; \ 272 source: "efl"; \
307 action: STATE_SET "default" 0.0; \ 273 action: STATE_SET "default" 0.0; \
308 target: "efl.cit_"#_pos".text"; \ 274 target: "efl.cit_"#_pos".text"; \
275 target: "cit_"#_pos"_event";\
309 } \ 276 } \
310 program { \ 277 program { \
311 name: "cit_"#_pos"_enable"; \ 278 name: "cit_"#_pos"_enable"; \
@@ -330,15 +297,15 @@
330 source: "cit_"#_pos"_clicked"; \ 297 source: "cit_"#_pos"_clicked"; \
331 signal: "mouse,down,1"; \ 298 signal: "mouse,down,1"; \
332 source: "cit_"#_pos"_event"; \ 299 source: "cit_"#_pos"_event"; \
333 action: STATE_SET "highlighted" 0.0; \ 300 action: STATE_SET "selected" 0.0; \
334 target: "cit_"#_pos"_selected2"; \ 301 target: "cit_"#_pos"_selected"; \
335 } \ 302 } \
336 program { \ 303 program { \
337 source: "cit_"#_pos"_clicked"; \ 304 source: "cit_"#_pos"_clicked"; \
338 signal: "mouse,up,1"; \ 305 signal: "mouse,up,1"; \
339 source: "cit_"#_pos"_event"; \ 306 source: "cit_"#_pos"_event"; \
340 action: STATE_SET "default" 0.0; \ 307 action: STATE_SET "default" 0.0; \
341 target: "cit_"#_pos"_selected2"; \ 308 target: "cit_"#_pos"_selected"; \
342 } \ 309 } \
343 program { \ 310 program { \
344 source: "cit_"#_pos"_clicked"; \ 311 source: "cit_"#_pos"_clicked"; \
@@ -420,15 +387,8 @@
420 } \ 387 } \
421 } 388 }
422 389
423group { "efl/calendar"; data.item: "version" "123"; 390group { name: "efl/calendar";
424 images.image: "sym_left_light_normal.png" COMP; 391 data.item: "version" "123";
425 images.image: "sym_right_light_normal.png" COMP;
426 images.image: "sym_left_glow_normal.png" COMP;
427 images.image: "sym_right_glow_normal.png" COMP;
428 images.image: "icon_border_remember.png" COMP;
429 images.image: "outline.png" COMP;
430 images.image: "box_glow.png" COMP;
431 images.image: "diagonal_stripes.png" COMP;
432 data.item: "focus_highlight" "on"; 392 data.item: "focus_highlight" "on";
433 script { 393 script {
434 public rtl; 394 public rtl;
@@ -437,32 +397,34 @@ group { "efl/calendar"; data.item: "version" "123";
437 public last_focused_item; 397 public last_focused_item;
438 } 398 }
439 styles { 399 styles {
440 CIT_STYLE 400 CIT_STYLES
441 } 401 }
442 parts { 402 parts {
443 part { name: "bg"; type: SPACER; 403 part { name: "bg"; type: SPACER;
404 scale: 1;
444 description { state: "default" 0.0; 405 description { state: "default" 0.0;
445 rel1.offset: 1 1; 406 rel1.offset: 8 8;
446 rel2.offset: -2 -2; 407 rel2.offset: -9 -9;
408 offscale;
447 } 409 }
448 } 410 }
449 part { name: "efl.background"; type: SWALLOW; 411 part { name: "efl.background"; type: SWALLOW;
450 description { state: "default" 0.0; 412 description { state: "default" 0.0;
451 rel1.to: "bg"; 413 rel.to: "bg";
452 rel2.to: "bg";
453 } 414 }
454 } 415 }
455 part { name: "spinner-base1"; type: SPACER; 416 part { name: "spinner-base1"; type: SPACER;
417 scale: 1;
456 description { state: "default" 0.0; 418 description { state: "default" 0.0;
457 min: 24 16; 419 min: 24 16;
458 max: 999999 16; 420 max: 999999 16;
459 rel1.to: "bg"; 421 rel.to: "bg";
460 rel2.to: "bg";
461 rel2.relative: 1.0 (1/8); 422 rel2.relative: 1.0 (1/8);
462 align: 0.5 0.0; 423 align: 0.5 0.0;
463 } 424 }
464 } 425 }
465 part { name: "table-base"; type: SPACER; 426 part { name: "table-base"; type: SPACER;
427 scale: 1;
466 description { state: "default" 0.0; 428 description { state: "default" 0.0;
467 min: 70 60; 429 min: 70 60;
468 rel1.to_x: "bg"; 430 rel1.to_x: "bg";
@@ -471,29 +433,31 @@ group { "efl/calendar"; data.item: "version" "123";
471 rel1.relative: 0.0 1.0; 433 rel1.relative: 0.0 1.0;
472 rel2.to: "bg"; 434 rel2.to: "bg";
473 rel2.offset: -4 -4; 435 rel2.offset: -4 -4;
436 offscale;
474 } 437 }
475 } 438 }
476 part { name: "header"; type: SPACER; 439 part { name: "header"; type: SPACER;
477 description { state: "default" 0.0; 440 description { state: "default" 0.0;
478 rel1.to: "table-base"; 441 rel.to: "table-base";
479 rel2.to: "table-base";
480 rel2.relative: 1.0 (1/7); 442 rel2.relative: 1.0 (1/7);
481 align: 0.5 0.0; 443 align: 0.5 0.0;
482 min: 0 16; 444 min: 0 25;
483 } 445 }
484 } 446 }
485 part { name: "header_separator"; mouse_events: 0; 447 part { name: "header_separator"; type: RECT; mouse_events: 0;
448 scale: 1;
486 description { state: "default" 0.0; 449 description { state: "default" 0.0;
487 fixed: 1 1; 450 fixed: 1 1;
488 rel1.to: "header"; 451 rel.to: "header";
489 rel1.relative: 0.0 1.0; 452 rel1.relative: 0.0 1.0;
490 rel1.offset: 0 -2; 453 rel1.offset: 8 -1;
491 rel2.to: "header"; 454 rel2.offset: -9 -1;
492 image.normal: "separator_horiz.png"; 455 color: 80 80 80 255;
493 fill.smooth: 0; 456 offscale;
494 } 457 }
495 } 458 }
496 part { name: "base"; type: SPACER; 459 part { name: "base"; type: SPACER;
460 scale: 1;
497 description { state: "default" 0.0; 461 description { state: "default" 0.0;
498 rel1.to_x: "table-base"; 462 rel1.to_x: "table-base";
499 rel1.to_y: "header"; 463 rel1.to_y: "header";
@@ -501,6 +465,7 @@ group { "efl/calendar"; data.item: "version" "123";
501 rel1.offset: 3 0; 465 rel1.offset: 3 0;
502 rel2.to: "table-base"; 466 rel2.to: "table-base";
503 rel2.offset: -3 0; 467 rel2.offset: -3 0;
468 offscale;
504 } 469 }
505 } 470 }
506 471
@@ -537,182 +502,148 @@ group { "efl/calendar"; data.item: "version" "123";
537 } 502 }
538} 503}
539 504
540#undef CAL_SPIN 505group { name: "efl/calendar/inc_button";
541#undef CIT 506 data.item: "version" "123";
542#undef CH 507 script {
543 508 public mouse_down = 0;
544 group { name: "efl/calendar/inc_button"; data.item: "version" "123"; 509 public multi_down = 0;
545 images.image: "sym_right_light_normal.png" COMP; 510 }
546 images.image: "sym_right_glow_normal.png" COMP; 511 parts {
547 images.image: "sym_right_dark_normal.png" COMP; 512 part { name: "arrow.image";
548 script { 513 scale: 1;
549 public mouse_down = 0; 514 description { state: "default" 0.0;
550 public multi_down = 0; 515 min: 15 15; max: 15 15;
551 } 516 color: 160 160 160 255;
552 parts { 517 image.normal: "i-arrow-r";
553 part { name: "arrow.image";
554 scale: 1;
555 description { state: "default" 0.0;
556 min: 15 15;
557 max: 15 15;
558 color_class: "F032L1";
559 image.normal: "sym_right_light_normal.png";
560 }
561 description { state: "pressed" 0.0;
562 inherit: "default" 0.0;
563 image.normal: "sym_right_glow_normal.png";
564 }
565 description { state: "disabled" 0.0;
566 inherit: "default" 0.0;
567 image.normal: "sym_right_dark_normal.png";
568 }
569 } 518 }
570 part { name: "over"; 519 description { state: "pressed" 0.0;
571 type: RECT; 520 inherit: "default" 0.0;
572 repeat_events: 1; 521 color: 255 255 255 255;
573 description { state: "default" 0.0;
574 color: 0 0 0 0;
575 }
576 } 522 }
577 part { name: "disabler"; 523 description { state: "disabled" 0.0;
578 type: RECT; 524 inherit: "default" 0.0;
579 description { state: "default" 0.0; 525 color: 96 96 96 255;
580 color: 0 0 0 0;
581 visible: 0;
582 }
583 description { state: "disabled" 0.0;
584 inherit: "default" 0.0;
585 visible: 1;
586 }
587 } 526 }
588 } 527 }
589 programs { 528 part { name: "over"; type: RECT;
590 program { name: "button_press"; 529 repeat_events: 1;
591 signal: "mouse,down,1"; 530 description { state: "default" 0.0;
592 source: "over"; 531 color: 0 0 0 0;
593 script {
594 if ((get_int(multi_down) == 0) &&
595 (get_int(mouse_down) == 0)) {
596 set_int(mouse_down, 1);
597 run_program(PROGRAM:"button_press2");
598 }
599 }
600 } 532 }
601 program { name: "button_press2"; 533 }
602 action: SIGNAL_EMIT "efl,action,press" ""; 534 part { name: "disabler"; type: RECT;
603 after: "button_press_anim"; 535 description { state: "default" 0.0;
536 color: 0 0 0 0;
537 visible: 0;
604 } 538 }
605 program { name: "button_press_anim"; 539 description { state: "disabled" 0.0;
606 action: STATE_SET "pressed" 0.0; 540 inherit: "default" 0.0;
607 target: "arrow.image"; 541 visible: 1;
608 } 542 }
609 program { name: "button_unpress"; 543 }
610 signal: "mouse,up,1"; 544 }
611 source: "over"; 545 programs {
612 script { 546 program { signal: "mouse,down,1"; source: "over";
613 if (get_int(mouse_down) == 1) { 547 script {
614 set_int(mouse_down, 0); 548 if ((get_int(multi_down) == 0) &&
615 run_program(PROGRAM:"button_unpress2"); 549 (get_int(mouse_down) == 0)) {
616 run_program(PROGRAM:"button_unpress_anim"); 550 set_int(mouse_down, 1);
617 } 551 run_program(PROGRAM:"button_press2");
618 } 552 }
619 } 553 }
620 program { name: "button_unpress2"; 554 }
621 action: SIGNAL_EMIT "efl,action,unpress" ""; 555 program { name: "button_press2";
622 } 556 action: SIGNAL_EMIT "efl,action,press" "";
623 program { name: "button_unpress_anim"; 557 after: "button_press_anim";
624 action: STATE_SET "default" 0.0; 558 }
625 target: "arrow.image"; 559 program { name: "button_press_anim";
626 } 560 action: STATE_SET "pressed" 0.0;
627 program { name: "button_click"; 561 target: "arrow.image";
628 signal: "mouse,clicked,1"; 562 }
629 source: "over"; 563 program { signal: "mouse,up,1"; source: "over";
630 script { 564 script {
631 if (get_int(multi_down) == 0) { 565 if (get_int(mouse_down) == 1) {
632 run_program(PROGRAM:"button_click2"); 566 set_int(mouse_down, 0);
633 } 567 run_program(PROGRAM:"button_unpress2");
568 run_program(PROGRAM:"button_unpress_anim");
634 } 569 }
635 } 570 }
636 program { name: "action_unpressed"; 571 }
637 signal: "efl,action,unpressed"; 572 program { name: "button_unpress2";
638 source: "efl"; 573 action: SIGNAL_EMIT "efl,action,unpress" "";
639 after: "button_unpress_anim"; 574 }
640 } 575 program { name: "button_unpress_anim";
641 program { name: "action_pressed"; 576 action: STATE_SET "default" 0.0;
642 signal: "efl,action,pressed"; 577 target: "arrow.image";
643 source: "efl"; 578 }
644 after: "button_press_anim"; 579 program { signal: "mouse,clicked,1"; source: "over";
645 } 580 script {
646 program { name: "button_click2"; 581 if (get_int(multi_down) == 0) {
647 action: SIGNAL_EMIT "efl,action,click" ""; 582 run_program(PROGRAM:"button_click2");
648 }
649 program { name: "access_pressed";
650 signal: "efl,state,animation,activated";
651 source: "efl";
652 action: STATE_SET "pressed" 0.0;
653 target: "arrow.image";
654 after: "access_pressed_anim";
655 }
656 program { name: "access_pressed_anim";
657 action: STATE_SET "default" 0.0;
658 transition: DECELERATE 0.1;
659 target: "arrow.image";
660 }
661 program { name: "disable";
662 signal: "efl,state,disabled";
663 source: "efl";
664 action: STATE_SET "disabled" 0.0;
665 target: "arrow.image";
666 target: "disabler";
667 }
668 program { name: "enable";
669 signal: "efl,state,enabled";
670 source: "efl";
671 action: STATE_SET "default" 0.0;
672 target: "arrow.image";
673 target: "disabler";
674 }
675 program {
676 name: "multi_down";
677 signal: "efl,action,multi,down";
678 source: "efl";
679 script {
680 set_int(multi_down, 1);
681 } 583 }
682 } 584 }
683 program { 585 }
684 name: "multi_up"; 586 program { signal: "efl,action,unpressed"; source: "efl";
685 signal: "efl,action,multi,up"; 587 after: "button_unpress_anim";
686 source: "efl"; 588 }
687 script { 589 program { signal: "efl,action,pressed"; source: "efl";
688 set_int(multi_down, 0); 590 after: "button_press_anim";
689 } 591 }
592 program { name: "button_click2";
593 action: SIGNAL_EMIT "efl,action,click" "";
594 }
595 program { signal: "efl,state,animation,activated"; source: "efl";
596 action: STATE_SET "pressed" 0.0;
597 target: "arrow.image";
598 after: "access_pressed_anim";
599 }
600 program { name: "access_pressed_anim";
601 action: STATE_SET "default" 0.0;
602 transition: DECELERATE 0.1;
603 target: "arrow.image";
604 }
605 program { signal: "efl,state,disabled"; source: "efl";
606 action: STATE_SET "disabled" 0.0;
607 target: "arrow.image";
608 target: "disabler";
609 }
610 program { signal: "efl,state,enabled"; source: "efl";
611 action: STATE_SET "default" 0.0;
612 target: "arrow.image";
613 target: "disabler";
614 }
615 program { signal: "efl,action,multi,down"; source: "efl";
616 script {
617 set_int(multi_down, 1);
618 }
619 }
620 program { signal: "efl,action,multi,up"; source: "efl";
621 script {
622 set_int(multi_down, 0);
690 } 623 }
691 } 624 }
692 } 625 }
626}
693 627
694 group { name: "efl/calendar/dec_button"; 628group { name: "efl/calendar/dec_button";
695 inherit: "efl/calendar/inc_button"; 629 inherit: "efl/calendar/inc_button";
696 data.item: "version" "123"; 630 data.item: "version" "123";
697 images.image: "sym_left_light_normal.png" COMP; 631 parts {
698 images.image: "sym_left_glow_normal.png" COMP; 632 part { name: "arrow.image";
699 images.image: "sym_left_dark_normal.png" COMP; 633 scale: 1;
700 parts { 634 description { state: "default" 0.0;
701 part { name: "arrow.image"; 635 image.normal: "i-arrow-l";
702 scale: 1; 636 }
703 description { state: "default" 0.0; 637 description { state: "pressed" 0.0;
704 min: 15 15; 638 image.normal: "i-arrow-l";
705 max: 15 15; 639 }
706 image.normal: "sym_left_light_normal.png"; 640 description { state: "disabled" 0.0;
707 } 641 image.normal: "i-arrow-l";
708 description { state: "pressed" 0.0;
709 inherit: "default" 0.0;
710 image.normal: "sym_left_glow_normal.png";
711 }
712 description { state: "disabled" 0.0;
713 inherit: "default" 0.0;
714 image.normal: "sym_left_dark_normal.png";
715 }
716 } 642 }
717 } 643 }
718 } 644 }
645}
646#undef CIT_STYLES
647#undef CAL_SPIN
648#undef CIT
649#undef CH
diff --git a/data/elementary/themes/edc/efl/check.edc b/data/elementary/themes/edc/efl/check.edc
index 0e01adc1c8..c07594520f 100644
--- a/data/elementary/themes/edc/efl/check.edc
+++ b/data/elementary/themes/edc/efl/check.edc
@@ -24,511 +24,443 @@ Group: efl/check (@since 1.23)
24 Signal: efl,text,set 24 Signal: efl,text,set
25 Signal: efl,text,unset 25 Signal: efl,text,unset
26*/ 26*/
27group { "efl/check"; data.item: "version" "123"; 27#define ICON 1
28 images.image: "inset_shadow_tiny.png" COMP; 28#define LABEL 2
29 images.image: "bevel_in.png" COMP; 29#define MASK 3
30 images.image: "sym_check_alum.png" COMP; 30#define DISABLE 4
31#define ICON 1 31#define PRESSED 8
32#define LABEL 2 32#define BACKGROUND 16
33#define MASK 3 33
34#define DISABLE 4 34group { name: "efl/check";
35 data.item: "version" "123";
35 script { 36 script {
36 public btmode; 37 BUTTONMODE_SCRIPT2
37 public eval_mode(m) {
38 new m1 = m & MASK;
39 new d = m & DISABLE;
40 if (m1 == (ICON | LABEL)) {
41 if (!d) {
42 set_state(PART:"efl.content", "visible", 0.0);
43 set_state(PART:"sizer_content", "visible", 0.0);
44 set_state(PART:"efl.text", "visible", 0.0);
45 set_state(PART:"shadow", "default", 0.0);
46 set_state(PART:"base", "default", 0.0);
47 set_state(PART:"clip", "default", 0.0);
48 set_state(PART:"event", "default", 0.0);
49 } else {
50 set_state(PART:"efl.content", "visible", 0.0);
51 set_state(PART:"sizer_content", "visible", 0.0);
52 set_state(PART:"efl.text", "disabled_visible", 0.0);
53 set_state(PART:"shadow", "disabled", 0.0);
54 set_state(PART:"base", "disabled", 0.0);
55 set_state(PART:"clip", "disabled", 0.0);
56 set_state(PART:"event", "disabled", 0.0);
57 }
58 } else if (m1 == (ICON)) {
59 if (!d) {
60 set_state(PART:"efl.content", "visible", 0.0);
61 set_state(PART:"sizer_content", "icononly", 0.0);
62 set_state(PART:"efl.text", "default", 0.0);
63 set_state(PART:"shadow", "default", 0.0);
64 set_state(PART:"base", "default", 0.0);
65 set_state(PART:"clip", "default", 0.0);
66 set_state(PART:"event", "default", 0.0);
67 } else {
68 set_state(PART:"efl.content", "visible", 0.0);
69 set_state(PART:"sizer_content", "icononly", 0.0);
70 set_state(PART:"efl.text", "disabled", 0.0);
71 set_state(PART:"shadow", "disabled", 0.0);
72 set_state(PART:"base", "disabled", 0.0);
73 set_state(PART:"clip", "disabled", 0.0);
74 set_state(PART:"event", "disabled", 0.0);
75 }
76 } else if (m1 == (LABEL)) {
77 if (!d) {
78 set_state(PART:"efl.content", "default", 0.0);
79 set_state(PART:"sizer_content", "default", 0.0);
80 set_state(PART:"efl.text", "visible", 0.0);
81 set_state(PART:"shadow", "default", 0.0);
82 set_state(PART:"base", "default", 0.0);
83 set_state(PART:"clip", "default", 0.0);
84 set_state(PART:"event", "default", 0.0);
85 } else {
86 set_state(PART:"efl.content", "default", 0.0);
87 set_state(PART:"sizer_content", "default", 0.0);
88 set_state(PART:"efl.text", "disabled_visible", 0.0);
89 set_state(PART:"shadow", "disabled", 0.0);
90 set_state(PART:"base", "disabled", 0.0);
91 set_state(PART:"clip", "disabled", 0.0);
92 set_state(PART:"event", "disabled", 0.0);
93 }
94 } else {
95 if (!d) {
96 set_state(PART:"efl.content", "default", 0.0);
97 set_state(PART:"sizer_content", "default", 0.0);
98 set_state(PART:"efl.text", "default", 0.0);
99 set_state(PART:"shadow", "default", 0.0);
100 set_state(PART:"base", "default", 0.0);
101 set_state(PART:"clip", "default", 0.0);
102 set_state(PART:"event", "default", 0.0);
103 } else {
104 set_state(PART:"efl.content", "default", 0.0);
105 set_state(PART:"sizer_content", "default", 0.0);
106 set_state(PART:"efl.text", "default", 0.0);
107 set_state(PART:"shadow", "disabled", 0.0);
108 set_state(PART:"base", "disabled", 0.0);
109 set_state(PART:"clip", "disabled", 0.0);
110 set_state(PART:"event", "disabled", 0.0);
111 }
112 }
113 }
114 } 38 }
115 parts { 39 parts {
116 part { name: "base"; type: RECT; 40 part { name: "shadow"; type: SPACER;
117 description { state: "default" 0.0; 41 description { state: "default";
118 rel1.offset: 1 1;
119 rel1.to: "inset";
120 rel2.offset: -2 -2;
121 rel2.to: "inset";
122 color: 24 24 24 255;
123 }
124 description { state: "disabled" 0.0;
125 inherit: "default" 0.0;
126 color: 64 64 64 255;
127 } 42 }
128 } 43 desc { "pressed"; inherit;
129 part { name: "shadow"; mouse_events: 0;
130 description { state: "default" 0.0;
131 image.normal: "inset_shadow_tiny.png";
132 image.border: 4 4 4 4;
133 rel1.to: "base";
134 rel2.to: "base";
135 } 44 }
136 description { state: "disabled" 0.0; 45 desc { "disabled"; inherit;
137 inherit: "default" 0.0;
138 visible: 0;
139 } 46 }
140 } 47 }
141 part { name: "inset"; mouse_events: 0; 48 rect { "icon_clip";
142 scale: 1; 49 desc { "default";
143 description { state: "default" 0.0; 50 color_class: "button_icon";
144 fixed: 1 0;
145 rel1.offset: 2 2;
146 rel2.relative: 0.0 1.0;
147 rel2.offset: 2 -3;
148 align: 0.0 0.5;
149 min: 13 13;
150 max: 13 13;
151 image.normal: "bevel_in.png";
152 image.border: 1 1 1 1;
153 image.middle: 0;
154 fill.smooth: 0;
155 } 51 }
156 } 52 desc { "pressed"; inherit;
157 part { name: "indicator"; mouse_events: 0; 53 color_class: "button_icon_pressed";
158 scale: 1;
159 clip_to: "clip";
160 description { state: "default" 0.0;
161 fixed: 1 1;
162 rel1.to: "base";
163 rel2.to: "base";
164 image.normal: "sym_check_alum.png";
165 min: 11 11;
166 max: 11 11;
167 visible: 0;
168 } 54 }
169 description { state: "selected" 0.0; 55 desc { "disabled"; inherit;
170 inherit: "default" 0.0; 56 color_class: "button_icon_disabled";
171 visible: 1;
172 } 57 }
173 } 58 }
174 part { name: "clip"; type: RECT; 59 swallow { "efl.background"; nomouse;
175 description { state: "default" 0.0; 60 required;
61 desc { "default";
62 rel.to: "shadow";
63 visible: 0;
176 } 64 }
177 description { state: "disabled" 0.0; 65 desc { "visible";
178 inherit: "default" 0.0; 66 inherit: "default";
179 color: 255 255 255 64; 67 visible: 1;
180 } 68 }
181 } 69 }
182 part { name: "efl.content"; type: SWALLOW; 70 swallow { "efl.content"; nomouse;
71 clip_to: "icon_clip";
183 scale: 1; 72 scale: 1;
184 clip_to: "clip"; 73 desc { "default";
185 required;
186 description { state: "default" 0.0;
187 fixed: 1 0; 74 fixed: 1 0;
188 visible: 0;
189 align: 0.0 0.5; 75 align: 0.0 0.5;
190 max: 0 0; 76 rel1.to_x: "base";
191 rel1.to_x: "inset"; 77 rel2.to_x: "base";
78 rel1.offset: 4 4;
192 rel1.relative: 1.0 0.0; 79 rel1.relative: 1.0 0.0;
193 rel1.offset: 1 1; 80 rel2.relative: 0.0 1.0;
194 rel2.to_x: "inset"; 81 rel2.offset: 4 -5;
195 rel2.offset: 1 -2; 82 visible: 0;
196 rel2.relative: 1.0 1.0; 83 offscale;
197 } 84 }
198 description { state: "visible" 0.0; 85 desc { "visible"; inherit;
199 inherit: "default" 0.0; 86 fixed: 1 0;
200 visible: 1;
201 aspect: 1.0 1.0; 87 aspect: 1.0 1.0;
202 min: 16 16; 88 min: ICMIN ICMIN;
89 visible: 1;
90 }
91 desc { "icononly"; inherit;
92 fixed: 0 0;
93 align: 0.5 0.5;
94 rel2.relative: 1.0 1.0;
95 rel2.offset: -5 -5;
96 rel2.to_x: "";
97 visible: 1;
203 } 98 }
204 } 99 }
205 part { name: "sizer_content"; type: TEXT; mouse_events: 0; 100 text { "sizer_content"; nomouse;
206 scale: 1; 101 scale: 1;
207 description { state: "default" 0.0; 102 desc { "default";
208 fixed: 1 1; 103 fixed: 1 1;
209 visible: 0; 104 visible: 0;
210 text { font: FN; size: 10; 105 text { font: FN; size: 10;
211 min: 0 0; 106 min: 0 0;
212 text_class: "check_text"; 107 text_class: "button_text";
213 } 108 }
214 } 109 }
215 description { state: "visible" 0.0; 110 desc { "visible"; inherit;
216 inherit: "default" 0.0; 111 rel.to: "efl.content";
217 rel1.to: "efl.content";
218 rel2.to: "efl.content";
219 text { 112 text {
220 min: 1 1; 113 min: 1 1;
221 ellipsis: -1; 114 ellipsis: -1;
222 text: "M"; 115 text: SPACER_TEXT;
223 } 116 }
224 } 117 }
225 description { state: "icononly" 0.0; 118 desc { "icononly"; inherit;
226 inherit: "default" 0.0; 119 rel.to: "efl.content";
227 rel1.to: "efl.content";
228 rel2.to: "efl.content";
229 text { 120 text {
230 min: 1 1; 121 min: 1 1;
231 ellipsis: -1; 122 ellipsis: -1;
232 text: "M"; 123 text: SPACER_TEXT;
233 } 124 }
234 } 125 }
235 } 126 }
236 part { name: "efl.text"; type: TEXT; mouse_events: 0; 127 part { name: "base"; type: RECT;
237 effect: SHADOW BOTTOM; 128 scale: 1;
129 description { state: "default";
130 fixed: 1 0;
131 color: 0 0 0 64;
132 align: 0.0 0.5;
133 min: 13 13;
134 max: 13 13;
135 rel1.offset: 4 4;
136 rel2.relative: 0.0 1.0;
137 rel2.offset: 4 -5;
138 aspect: 1.0 1.0; aspect_preference: VERTICAL;
139 offscale;
140 }
141 desc { "pressed"; inherit;
142 color: 0 0 0 128;
143 }
144 desc { "disabled"; inherit;
145 color: 0 0 0 16;
146 }
147 }
148 part { name: "ck_check";
149 clip_to: "ck_selected";
238 scale: 1; 150 scale: 1;
239 required;
240 description { state: "default" 0.0; 151 description { state: "default" 0.0;
241 rel1.offset: 2 2; 152 fixed: 0 0;
242 rel1.to_x: "efl.content"; 153 rel.to: "base";
154 image.normal: "i-check";
155 min: 15 15;
156 max: 15 15;
157 visible: 0;
158 color: 160 160 160 255;
159 fixed: 1 1;
160 }
161 description { state: "pressed" 0.0;
162 inherit: "default" 0.0;
163 color: 255 255 255 255;
164 visible: 1;
165 }
166 description { state: "selected" 0.0;
167 inherit: "default" 0.0;
168 visible: 1;
169 }
170 }
171 part { name: "ck_selected"; type: RECT;
172 description { state: "default" 0.0;
173 rel.to: "base";
174 }
175 description { state: "disabled" 0.0;
176 inherit: "default" 0.0;
177 color: 153 153 153 255;
178 }
179 }
180 text { "efl.text"; nomouse;
181 scale: 1;
182 desc { "default";
183 fixed: 0 1;
184 color: 160 160 160 255;
185 rel1.offset: 0 4;
243 rel1.relative: 1.0 0.0; 186 rel1.relative: 1.0 0.0;
244 rel2.offset: -3 -3; 187 rel1.to_x: "efl.content";
245 color: FN_COL_DEFAULT; 188 rel2.offset: -5 -5;
246 color_class: "check_text";
247 text { font: FN; size: 10; 189 text { font: FN; size: 10;
248 min: 0 0; 190 align: 0.0 0.5;
249 align: 0.0 0.5; 191 min: 0 0;
250 text_class: "check";
251 } 192 }
193 visible: 0;
194 offscale;
252 } 195 }
253 description { state: "disabled" 0.0; 196 desc { "visible"; inherit;
254 inherit: "default" 0.0; 197 fixed: 0 0;
255 color_class: "check_text_disabled"; 198 rel1.offset: 4 4;
256 color3: 255 255 255 255; 199 text.min: 1 1;
200 text.ellipsis: -1;
201 visible: 1;
257 } 202 }
258 description { state: "visible" 0.0; 203 desc { "pressed_visible"; inherit;
259 inherit: "default" 0.0; 204 fixed: 0 0;
205 color: 255 255 255 255;
206 rel1.offset: 4 4;
207 text.min: 1 1;
208 text.ellipsis: -1;
260 visible: 1; 209 visible: 1;
210 }
211 desc { "textonly"; inherit;
212 fixed: 0 0;
261 text.min: 1 1; 213 text.min: 1 1;
262 text.ellipsis: -1; 214 text.ellipsis: -1;
215 visible: 1;
263 } 216 }
264 description { state: "disabled_visible" 0.0; 217 desc { "pressed_textonly"; inherit;
265 inherit: "default" 0.0; 218 fixed: 0 0;
266 color_class: "check_text_disabled"; 219 color: 255 255 255 255;
267 color3: 255 255 255 255; 220 text.min: 1 1;
221 text.ellipsis: -1;
222 visible: 1;
223 }
224 desc { "disabled_visible"; inherit;
225 fixed: 0 0;
226 color: 96 96 96 255;
227 rel1.offset: 4 4;
228 text.min: 1 1;
229 text.ellipsis: -1;
268 visible: 1; 230 visible: 1;
231 }
232 desc { "disabled_textonly"; inherit;
233 fixed: 0 0;
234 color: 96 96 96 255;
269 text.min: 1 1; 235 text.min: 1 1;
270 text.ellipsis: -1; 236 text.ellipsis: -1;
237 visible: 1;
271 } 238 }
272 } 239 }
273 part { name: "event"; type: RECT; 240 rect { "event";
274 ignore_flags: ON_HOLD; 241 ignore_flags: ON_HOLD;
275 description { state: "default" 0.0; 242 desc { "default";
276 color: 0 0 0 0; 243 color: 0 0 0 0;
277 } 244 }
278 description { state: "disabled" 0.0; 245 desc { "disabled"; inherit;
279 inherit: "default" 0.0;
280 visible: 0; 246 visible: 0;
281 } 247 }
282 } 248 }
283 } 249 }
284 programs { 250 programs {
285 EFL_UI_CLICKABLE_PART_BIND(event) 251 EFL_UI_CLICKABLE_PART_BIND("event")
286 program { 252 program { signal: "mouse,down,1"; source: "event";
287 signal: "efl,state,selected"; source: "efl"; 253 script {
254 new buf[32]; new Float:val;
255 get_state(PART:"ck_check", buf, 32, val);
256 if (!strcmp(buf, "default")) { run_program(PROGRAM:"snd-check-on"); }
257 else { run_program(PROGRAM:"snd-check-off"); }
258 echo(buf);
259 }
260 }
261 program { signal: "efl,state,selected"; source: "efl";
288 action: STATE_SET "selected" 0.0; 262 action: STATE_SET "selected" 0.0;
289 target: "indicator"; 263 target: "ck_check";
290 } 264 }
291 program { 265 program { signal: "efl,state,unselected"; source: "efl";
292 signal: "efl,state,unselected"; source: "efl";
293 action: STATE_SET "default" 0.0; 266 action: STATE_SET "default" 0.0;
294 target: "indicator"; 267 target: "ck_check";
295 } 268 }
296 program { 269 program { name: "snd-check-on";
297 signal: "efl,text,set"; source: "efl"; 270 action: PLAY_SAMPLE "wood-tap1" 1.0 INPUT;
298 script {
299 new m = get_int(btmode);
300 m |= LABEL; set_int(btmode, m);
301 eval_mode(m);
302 }
303 } 271 }
304 program { 272 program { name: "snd-check-off";
305 signal: "efl,text,unset"; source: "efl"; 273 action: PLAY_SAMPLE "wood-tap2" 1.0 INPUT;
306 script {
307 new m = get_int(btmode);
308 m &= ~LABEL; set_int(btmode, m);
309 eval_mode(m);
310 }
311 } 274 }
312 program { 275 program { signal: "mouse,down,1"; source: "event";
313 signal: "efl,content,set"; source: "efl"; 276 action: SIGNAL_EMIT "efl,action,press" "efl";
314 script { 277 after: "button_click_anim";
315 new m = get_int(btmode);
316 m |= ICON; set_int(btmode, m);
317 eval_mode(m);
318 }
319 } 278 }
320 program { 279 program { signal: "mouse,down,1"; source: "event";
321 signal: "efl,content,unset"; source: "efl"; 280 action: STATE_SET "pressed" 0.0;
322 script { 281 target: "ck_check";
323 new m = get_int(btmode);
324 m &= ~ICON; set_int(btmode, m);
325 eval_mode(m);
326 }
327 } 282 }
328 program { 283 program { name: "button_click_anim";
329 signal: "efl,state,disabled"; source: "efl"; 284 script { flag_set(PRESSED); }
330 script {
331 new m = get_int(btmode);
332 m |= DISABLE; set_int(btmode, m);
333 eval_mode(m);
334 }
335 } 285 }
336 program { 286 program { signal: "mouse,up,1"; source: "event";
337 signal: "efl,state,enabled"; source: "efl"; 287 action: STATE_SET "default" 0.0;
338 script { 288 target: "ck_check";
339 new m = get_int(btmode); 289 }
340 m &= ~DISABLE; set_int(btmode, m); 290 program { signal: "mouse,up,1"; source: "event";
341 eval_mode(m); 291 script { flag_unset(PRESSED); }
342 } 292 }
293 program { signal: "efl,text,set"; source: "efl";
294 script { flag_set(LABEL); }
295 }
296 program { signal: "efl,text,unset"; source: "efl";
297 script { flag_unset(LABEL); }
298 }
299 program { signal: "efl,content,set"; source: "efl";
300 script { flag_set(ICON); }
301 }
302 program { signal: "efl,content,unset"; source: "efl";
303 script { flag_unset(ICON); }
304 }
305 program { signal: "efl,state,disabled"; source: "efl";
306 script { flag_set(DISABLE); }
307 }
308 program { signal: "efl,state,enabled"; source: "efl";
309 script { flag_unset(DISABLE); }
310 }
311 program { signal: "efl,state,disabled"; source: "efl";
312 action: STATE_SET "disabled" 0.0;
313 target: "ck_selected";
314 }
315 program { signal: "efl,state,enabled"; source: "efl";
316 action: STATE_SET "default" 0.0;
317 target: "ck_selected";
343 } 318 }
344 } 319 }
345#undef ICON
346#undef LABEL
347#undef MASK
348#undef DISABLE
349} 320}
350 321
351group { "efl/check:toggle"; data.item: "version" "123"; 322group { name: "efl/check:toggle";
352 images.image: "inset_shadow_tiny.png" COMP;
353 images.image: "bevel_in.png" COMP;
354 images.image: "bevel_out.png" COMP;
355 images.image: "vgrad_med_lighter.png" COMP;
356 images.image: "shadow_square_tiny.png" COMP;
357 images.image: "glow_small.png" COMP;
358
359#define ICON 1
360#define LABEL 2
361#define MASK 3
362#define DISABLE 4
363 script { 323 script {
364 public is_rtl;
365 public is_drag; 324 public is_drag;
366 public was_drag; 325 public was_drag;
367 public btmode; 326 public is_rtl;
368 public eval_mode(m) { 327
369 new m1 = m & MASK; 328 BUTTONMODE_SCRIPT2
370 new d = m & DISABLE; 329 }
371 if (m1 == (ICON | LABEL)) { 330 parts {
372 if (!d) { 331 part { name: "shadow"; type: SPACER;
373 set_state(PART:"efl.content", "visible", 0.0); 332 description { state: "default";
374 set_state(PART:"sizer_content", "visible", 0.0); 333 }
375 set_state(PART:"efl.text", "visible", 0.0); 334 desc { "pressed"; inherit;
376 set_state(PART:"shadow", "default", 0.0); 335 }
377 set_state(PART:"clip", "default", 0.0); 336 desc { "disabled"; inherit;
378 set_state(PART:"event", "default", 0.0); 337 }
379 set_state(PART:"event2", "default", 0.0); 338 }
380 set_state(PART:"efl.ontext", "default", 0.0); 339 swallow { "efl.background"; nomouse;
381 set_state(PART:"efl.offtext", "default", 0.0); 340 required;
382 set_state(PART:"onrect", "default", 0.0); 341 desc { "default";
383 set_state(PART:"offrect", "default", 0.0); 342 rel.to: "shadow";
384 } else { 343 visible: 0;
385 set_state(PART:"efl.content", "visible", 0.0); 344 }
386 set_state(PART:"sizer_content", "visible", 0.0); 345 desc { "visible";
387 set_state(PART:"efl.text", "disabled_visible", 0.0); 346 inherit: "default";
388 set_state(PART:"shadow", "disabled", 0.0); 347 visible: 1;
389 set_state(PART:"clip", "disabled", 0.0); 348 }
390 set_state(PART:"event", "disabled", 0.0); 349 }
391 set_state(PART:"event2", "disabled", 0.0); 350 rect { "icon_clip";
392 set_state(PART:"efl.ontext", "disabled", 0.0); 351 desc { "default";
393 set_state(PART:"efl.offtext", "disabled", 0.0); 352 color_class: "button_icon";
394 set_state(PART:"onrect", "disabled", 0.0); 353 }
395 set_state(PART:"offrect", "disabled", 0.0); 354 desc { "pressed"; inherit;
396 } 355 color_class: "button_icon_pressed";
397 } else if (m1 == (ICON)) { 356 }
398 if (!d) { 357 desc { "disabled"; inherit;
399 set_state(PART:"efl.content", "visible", 0.0); 358 color_class: "button_icon_disabled";
400 set_state(PART:"sizer_content", "icononly", 0.0); 359 }
401 set_state(PART:"efl.text", "default", 0.0); 360 }
402 set_state(PART:"shadow", "default", 0.0); 361 swallow { "efl.content"; nomouse;
403 set_state(PART:"clip", "default", 0.0); 362 clip_to: "icon_clip";
404 set_state(PART:"event", "default", 0.0); 363 scale: 1;
405 set_state(PART:"event2", "default", 0.0); 364 desc { "default";
406 set_state(PART:"efl.ontext", "default", 0.0); 365 fixed: 1 0;
407 set_state(PART:"efl.offtext", "default", 0.0); 366 align: 0.0 0.5;
408 set_state(PART:"onrect", "default", 0.0); 367 rel1.offset: 4 4;
409 set_state(PART:"offrect", "default", 0.0); 368 rel2.relative: 0.0 1.0;
410 } else { 369 rel2.offset: 4 -5;
411 set_state(PART:"efl.content", "visible", 0.0); 370 visible: 0;
412 set_state(PART:"sizer_content", "icononly", 0.0); 371 offscale;
413 set_state(PART:"efl.text", "disabled", 0.0); 372 }
414 set_state(PART:"shadow", "disabled", 0.0); 373 desc { "visible"; inherit;
415 set_state(PART:"clip", "disabled", 0.0); 374 fixed: 1 0;
416 set_state(PART:"event", "disabled", 0.0); 375 aspect: 1.0 1.0;
417 set_state(PART:"event2", "disabled", 0.0); 376 visible: 1;
418 set_state(PART:"efl.ontext", "disabled", 0.0); 377 }
419 set_state(PART:"efl.offtext", "disabled", 0.0); 378 desc { "icononly"; inherit;
420 set_state(PART:"onrect", "disabled", 0.0); 379 fixed: 0 0;
421 set_state(PART:"offrect", "disabled", 0.0); 380 align: 0.5 0.5;
381 rel2.relative: 1.0 1.0;
382 rel2.offset: -5 -5;
383 rel2.to_x: "tog";
384 rel2.relative: 0.0 1.0;
385 visible: 1;
386 }
387 }
388 text { "sizer_content"; nomouse;
389 scale: 1;
390 desc { "default";
391 visible: 0;
392 text { font: FN; size: 10;
393 min: 0 0;
394 text_class: "button_text";
422 } 395 }
423 } else if (m1 == (LABEL)) { 396 }
424 if (!d) { 397 desc { "visible"; inherit;
425 set_state(PART:"efl.content", "default", 0.0); 398 rel.to: "efl.content";
426 set_state(PART:"sizer_content", "default", 0.0); 399 text {
427 set_state(PART:"efl.text", "visible", 0.0); 400 min: 1 1;
428 set_state(PART:"shadow", "default", 0.0); 401 ellipsis: -1;
429 set_state(PART:"clip", "default", 0.0); 402 text: SPACER_TEXT;
430 set_state(PART:"event", "default", 0.0);
431 set_state(PART:"event2", "default", 0.0);
432 set_state(PART:"efl.ontext", "default", 0.0);
433 set_state(PART:"efl.offtext", "default", 0.0);
434 set_state(PART:"onrect", "default", 0.0);
435 set_state(PART:"offrect", "default", 0.0);
436 } else {
437 set_state(PART:"efl.content", "default", 0.0);
438 set_state(PART:"sizer_content", "default", 0.0);
439 set_state(PART:"efl.text", "disabled_visible", 0.0);
440 set_state(PART:"shadow", "disabled", 0.0);
441 set_state(PART:"clip", "disabled", 0.0);
442 set_state(PART:"event", "disabled", 0.0);
443 set_state(PART:"event2", "disabled", 0.0);
444 set_state(PART:"efl.ontext", "disabled", 0.0);
445 set_state(PART:"efl.offtext", "disabled", 0.0);
446 set_state(PART:"onrect", "disabled", 0.0);
447 set_state(PART:"offrect", "disabled", 0.0);
448 } 403 }
449 } else { 404 }
450 if (!d) { 405 desc { "icononly"; inherit;
451 set_state(PART:"efl.content", "default", 0.0); 406 rel.to: "efl.content";
452 set_state(PART:"sizer_content", "default", 0.0); 407 text {
453 set_state(PART:"efl.text", "default", 0.0); 408 min: 1 1;
454 set_state(PART:"shadow", "default", 0.0); 409 ellipsis: -1;
455 set_state(PART:"clip", "default", 0.0); 410 text: SPACER_TEXT;
456 set_state(PART:"event", "default", 0.0);
457 set_state(PART:"event2", "default", 0.0);
458 set_state(PART:"efl.ontext", "default", 0.0);
459 set_state(PART:"efl.offtext", "default", 0.0);
460 set_state(PART:"onrect", "default", 0.0);
461 set_state(PART:"offrect", "default", 0.0);
462 } else {
463 set_state(PART:"efl.content", "default", 0.0);
464 set_state(PART:"sizer_content", "default", 0.0);
465 set_state(PART:"efl.text", "default", 0.0);
466 set_state(PART:"shadow", "disabled", 0.0);
467 set_state(PART:"clip", "disabled", 0.0);
468 set_state(PART:"event", "disabled", 0.0);
469 set_state(PART:"event2", "disabled", 0.0);
470 set_state(PART:"efl.ontext", "disabled", 0.0);
471 set_state(PART:"efl.offtext", "disabled", 0.0);
472 set_state(PART:"onrect", "disabled", 0.0);
473 set_state(PART:"offrect", "disabled", 0.0);
474 } 411 }
475 } 412 }
476 } 413 }
477 } 414 spacer { name: "tog"; scale: 1;
478 parts {
479 part { name: "tog"; type: SPACER;
480 scale: 1;
481 description { state: "default" 0.0; 415 description { state: "default" 0.0;
482 fixed: 1 0; 416 fixed: 1 1;
483 rel1.relative: 1.0 0.0; 417 rel1.relative: 1.0 0.0;
484 rel1.offset: 2 2; 418 rel1.offset: -5 4;
485 rel2.offset: -3 -3; 419 rel2.offset: -5 -5;
486 align: 1.0 0.5; 420 align: 1.0 0.5;
487 min: 88 15; 421 min: 88 15;
488 max: 88 15; 422 max: 88 15;
423 offscale;
489 } 424 }
490 } 425 }
491 part { name: "onrect"; type: RECT; mouse_events: 0; 426 rect { name: "base";
492 scale: 1; 427 description { state: "default";
493 clip_to: "tog_clip"; 428 fixed: 1 1;
429 color: 0 0 0 64;
430 rel.to: "tog";
431 }
432 desc { "pressed"; inherit;
433 color: 0 0 0 128;
434 }
435 desc { "disabled"; inherit;
436 color: 0 0 0 16;
437 }
438 }
439 spacer { name: "onrect";
494 description { state: "default" 0.0; 440 description { state: "default" 0.0;
495 rel1.to: "button"; 441 rel.to: "button";
496 rel1.relative: -5.0 0.0; 442 rel1.relative: -5.0 0.0;
497 rel2.to: "button";
498 rel2.relative: 0.5 1.0; 443 rel2.relative: 0.5 1.0;
499 color: 24 24 24 255;
500 }
501 description { state: "disabled" 0.0;
502 inherit: "default" 0.0;
503 color: 64 64 64 255;
504 } 444 }
505 } 445 }
506 part { name: "offrect"; type: RECT; mouse_events: 0; 446 spacer { name: "offrect";
507 scale: 1;
508 clip_to: "tog_clip";
509 description { state: "default" 0.0; 447 description { state: "default" 0.0;
510 rel1.to: "button"; 448 rel.to: "button";
511 rel1.relative: 0.5 0.0; 449 rel1.relative: 0.5 0.0;
512 rel2.to: "button";
513 rel2.relative: 6.0 1.0; 450 rel2.relative: 6.0 1.0;
514 color: 24 24 24 255;
515 }
516 description { state: "disabled" 0.0;
517 inherit: "default" 0.0;
518 color: 64 64 64 255;
519 } 451 }
520 } 452 }
521 part { name: "efl.offtext"; type: TEXT; mouse_events: 0; 453 text { name: "efl.offtext"; nomouse; scale: 1;
522 effect: SHADOW BOTTOM;
523 scale: 1;
524 clip_to: "tog_clip"; 454 clip_to: "tog_clip";
525 description { state: "default" 0.0; 455 description { state: "default" 0.0;
526 fixed: 1 1; 456 fixed: 1 1;
527 rel1.to: "button"; 457 rel1.to: "button";
528 rel1.relative: 1.0 0.0; 458 rel1.relative: 1.0 0.0;
459 rel1.offset: 4 0;
529 rel2.to: "offrect"; 460 rel2.to: "offrect";
530 color: FN_COL_DEFAULT; 461 rel2.offset: -5 -1;
531 color_class: "check_off_text"; 462 offscale;
463 color: 160 160 160 255;
532 text { font: FN; size: 10; 464 text { font: FN; size: 10;
533 min: 0 1; 465 min: 0 1;
534 align: 0.5 0.5; 466 align: 0.5 0.5;
@@ -538,24 +470,24 @@ group { "efl/check:toggle"; data.item: "version" "123";
538 } 470 }
539 description { state: "disabled" 0.0; 471 description { state: "disabled" 0.0;
540 inherit: "default" 0.0; 472 inherit: "default" 0.0;
541 color_class: "check_off_text_disabled"; 473 color: 96 96 96 255;
542 color3: 255 255 255 255; 474 }
475 description { state: "clicked" 0.0;
476 inherit: "default" 0.0;
477 color: 255 255 255 255;
543 } 478 }
544 } 479 }
545 part { name: "efl.ontext"; type: TEXT; mouse_events: 0; 480 text { name: "efl.ontext"; nomouse; scale: 1;
546 effect: GLOW;
547 scale: 1;
548 clip_to: "tog_clip"; 481 clip_to: "tog_clip";
549 description { state: "default" 0.0; 482 description { state: "default" 0.0;
550 fixed: 1 1; 483 fixed: 1 1;
551 rel1.to: "onrect"; 484 rel1.to: "onrect";
552 rel1.offset: 2 -1; 485 rel1.offset: 4 0;
553 rel2.to: "button"; 486 rel2.to: "button";
554 rel2.relative: 0.0 1.0; 487 rel2.relative: 0.0 1.0;
555 rel2.offset: -1 -2; 488 rel2.offset: -5 -1;
556 color_class: "check_on_text"; 489 offscale;
557 color2: 255 255 255 255; 490 color: 51 153 255 255;
558 color3: 255 255 255 255;
559 text { font: FN; size: 10; 491 text { font: FN; size: 10;
560 min: 0 1; 492 min: 0 1;
561 align: 0.5 0.5; 493 align: 0.5 0.5;
@@ -565,44 +497,19 @@ group { "efl/check:toggle"; data.item: "version" "123";
565 } 497 }
566 description { state: "disabled" 0.0; 498 description { state: "disabled" 0.0;
567 inherit: "default" 0.0; 499 inherit: "default" 0.0;
568 color_class: "check_on_text_disabled"; 500 color: 96 96 96 255;
569 color3: 255 255 255 255;
570 } 501 }
571 } 502 description { state: "clicked" 0.0;
572 part { name: "shadow"; mouse_events: 0;
573 description { state: "default" 0.0;
574 image.normal: "inset_shadow_tiny.png";
575 image.border: 4 4 4 4;
576 rel1.to: "tog";
577 rel2.to: "tog";
578 }
579 description { state: "disabled" 0.0;
580 inherit: "default" 0.0; 503 inherit: "default" 0.0;
581 visible: 0; 504 color: 255 255 255 255;
582 }
583 }
584 part { name: "inset"; mouse_events: 0;
585 scale: 1;
586 description { state: "default" 0.0;
587 fixed: 1 1;
588 rel1.to: "tog";
589 rel1.offset: -1 -1;
590 rel2.to: "tog";
591 rel2.offset: 0 0;
592 image.normal: "bevel_in.png";
593 image.border: 1 1 1 1;
594 image.middle: 0;
595 fill.smooth: 0;
596 } 505 }
597 } 506 }
598 part { name: "tog_clip"; type: RECT; 507 part { name: "tog_clip"; type: RECT;
599 description { state: "default" 0.0; 508 description { state: "default" 0.0;
600 rel1.to: "tog"; 509 rel.to: "tog";
601 rel2.to: "tog";
602 } 510 }
603 } 511 }
604 part { name: "button"; type: RECT; 512 part { name: "button"; type: RECT; scale: 1;
605 scale: 1;
606 clip_to: "tog_clip"; 513 clip_to: "tog_clip";
607 dragable { 514 dragable {
608 x: 1 1 0; 515 x: 1 1 0;
@@ -611,219 +518,132 @@ group { "efl/check:toggle"; data.item: "version" "123";
611 } 518 }
612 description { state: "default" 0.0; 519 description { state: "default" 0.0;
613 fixed: 1 1; 520 fixed: 1 1;
614 rel1.to: "tog"; 521 rel.to: "tog";
615 rel2.to: "tog";
616 min: 15 15; 522 min: 15 15;
617 max: 15 99999; 523 max: 15 99999;
618 color: 0 0 0 0; 524 color: 0 0 0 0;
619 } 525 }
620 } 526 }
621 part { name: "shadow_but"; mouse_events: 0; 527 rect { name: "base_but"; nomouse;
622 description { state: "default" 0.0; 528 description { state: "default" 0.0;
623 rel1.offset: -3 -2; 529 rel.to: "button";
624 rel1.to: "base_but"; 530 color: 51 153 255 255;
625 rel2.offset: 2 4;
626 rel2.to: "base_but";
627 image.normal: "shadow_square_tiny.png";
628 image.border: 6 6 6 6;
629 fill.smooth: 0;
630 } 531 }
631 description { state: "clicked" 0.0; 532 description { state: "clicked" 0.0;
632 inherit: "default" 0.0; 533 inherit: "default" 0.0;
633 rel1.offset: -2 -2; 534 color: 255 255 255 255;
634 rel2.offset: 1 1;
635 color: 255 255 255 128;
636 } 535 }
637 } 536 description { state: "disabled" 0.0;
638 part { name: "glow_but"; mouse_events: 0;
639 description { state: "default" 0.0;
640 rel1.offset: -3 -3;
641 rel1.to: "base_but";
642 rel2.offset: 2 2;
643 rel2.to: "base_but";
644 image.normal: "glow_small.png";
645 image.border: 7 7 7 7;
646 fill.smooth: 0;
647 visible: 0;
648 }
649 description { state: "clicked" 0.0;
650 inherit: "default" 0.0; 537 inherit: "default" 0.0;
651 visible: 1; 538 color: 64 64 64 255;
652 }
653 }
654 part { name: "base_but"; mouse_events: 0;
655 description { state: "default" 0.0;
656 rel1.to: "button";
657 rel2.to: "button";
658 image.normal: "vgrad_med_lighter.png";
659 fill.smooth: 0;
660 TILED_HORIZ(120)
661 }
662 }
663 part { name: "bevel_but"; mouse_events: 0;
664 description { state: "default" 0.0;
665 rel1.to: "base_but";
666 rel2.to: "base_but";
667 image.normal: "bevel_out.png";
668 image.border: 1 1 1 1;
669 image.middle: 0;
670 fill.smooth: 0;
671 } 539 }
672 } 540 }
673 part { name: "button_events"; type: RECT; 541 rect { name: "button_events";
674 dragable.events: "button"; 542 dragable.events: "button";
675 description { state: "default" 0.0; 543 description { state: "default" 0.0;
676 color: 0 0 0 0; 544 color: 0 0 0 0;
677 } 545 }
678 } 546 }
679 part { name: "clip"; type: RECT; 547 text { "efl.text"; nomouse;
680 description { state: "default" 0.0;
681 }
682 description { state: "disabled" 0.0;
683 inherit: "default" 0.0;
684 color: 255 255 255 64;
685 }
686 }
687 part { name: "efl.content"; type: SWALLOW;
688 scale: 1; 548 scale: 1;
689 clip_to: "clip"; 549 desc { "default";
690 description { state: "default" 0.0; 550 fixed: 0 1;
691 fixed: 1 0; 551 color: 160 160 160 255;
692 visible: 0; 552 rel1.offset: 0 4;
693 align: 0.0 0.5; 553 rel1.relative: 1.0 0.0;
694 max: 0 0; 554 rel1.to_x: "efl.content";
695 rel1.offset: 1 1; 555 rel2.offset: -5 -5;
696 rel2.offset: 1 -2;
697 rel2.relative: 0.0 1.0; 556 rel2.relative: 0.0 1.0;
698 } 557 rel2.to_x: "tog";
699 description { state: "visible" 0.0;
700 inherit: "default" 0.0;
701 fixed: 0 0;
702 visible: 1;
703 min: 16 16;
704 }
705 }
706 part { name: "sizer_content"; type: TEXT; mouse_events: 0;
707 scale: 1;
708 description { state: "default" 0.0;
709 fixed: 1 1;
710 visible: 0;
711 text { font: FN; size: 10; 558 text { font: FN; size: 10;
559 align: 0.5 0.5;
712 min: 0 0; 560 min: 0 0;
713 text_class: "check_text";
714 }
715 }
716 description { state: "visible" 0.0;
717 inherit: "default" 0.0;
718 rel1.to: "efl.content";
719 rel2.to: "efl.content";
720 text {
721 min: 1 1;
722 ellipsis: -1;
723 text: "M";
724 }
725 }
726 description { state: "icononly" 0.0;
727 inherit: "default" 0.0;
728 rel1.to: "efl.content";
729 rel2.to: "efl.content";
730 text {
731 min: 1 1;
732 ellipsis: -1;
733 text: "M";
734 } 561 }
562 visible: 0;
563 offscale;
735 } 564 }
736 } 565 desc { "visible"; inherit;
737 part { name: "efl.text"; type: TEXT; mouse_events: 0; 566 fixed: 0 0;
738 effect: SHADOW BOTTOM; 567 rel1.offset: 4 4;
739 scale: 1; 568 text.min: 1 1;
740 description { state: "default" 0.0; 569 text.ellipsis: -1;
741 rel1.to_x: "efl.content"; 570 visible: 1;
742 rel1.relative: 1.0 0.0;
743 rel1.offset: 2 2;
744 rel2.to_x: "tog";
745 rel2.relative: 0.0 1.0;
746 rel2.offset: -5 -3;
747 color: FN_COL_DEFAULT;
748 color_class: "check_text";
749 text { font: FN; size: 10;
750 min: 0 0;
751 align: 0.0 0.5;
752 text_class: "check";
753 }
754 } 571 }
755 description { state: "disabled" 0.0; 572 desc { "pressed_visible"; inherit;
756 inherit: "default" 0.0; 573 fixed: 0 0;
757 color_class: "check_text_disabled"; 574 color: 255 255 255 255;
758 color3: 255 255 255 255; 575 rel1.offset: 4 4;
576 text.min: 1 1;
577 text.ellipsis: -1;
578 visible: 1;
759 } 579 }
760 description { state: "visible" 0.0; 580 desc { "textonly"; inherit;
761 inherit: "default" 0.0; 581 fixed: 0 0;
582 text.min: 1 1;
583 text.ellipsis: -1;
762 visible: 1; 584 visible: 1;
585 }
586 desc { "pressed_textonly"; inherit;
587 fixed: 0 0;
588 color: 255 255 255 255;
763 text.min: 1 1; 589 text.min: 1 1;
764 text.ellipsis: -1; 590 text.ellipsis: -1;
591 visible: 1;
765 } 592 }
766 description { state: "disabled_visible" 0.0; 593 desc { "disabled_visible"; inherit;
767 inherit: "default" 0.0; 594 fixed: 0 0;
768 color_class: "check_text_disabled"; 595 color: 96 96 96 255;
769 color3: 255 255 255 255; 596 rel1.offset: 4 4;
597 text.min: 1 1;
598 text.ellipsis: -1;
770 visible: 1; 599 visible: 1;
600 }
601 desc { "disabled_textonly"; inherit;
602 fixed: 0 0;
603 color: 96 96 96 255;
771 text.min: 1 1; 604 text.min: 1 1;
772 text.ellipsis: -1; 605 text.ellipsis: -1;
606 visible: 1;
773 } 607 }
774 } 608 }
775 part { name: "event"; type: RECT; 609 rect { "event2";
776 ignore_flags: ON_HOLD; 610 desc { "default";
777 description { state: "default" 0.0;
778 color: 0 0 0 0; 611 color: 0 0 0 0;
779 rel1.to_x: "efl.content";
780 rel2.to_x: "efl.text";
781 }
782 description { state: "disabled" 0.0;
783 inherit: "default" 0.0;
784 visible: 0; 612 visible: 0;
785 } 613 }
614 desc { "disabled"; inherit;
615 visible: 1;
616 }
786 } 617 }
787 part { name: "event2"; type: RECT; 618 rect { "event"; repeat;
788 ignore_flags: ON_HOLD; 619 ignore_flags: ON_HOLD;
789 description { state: "default" 0.0; 620 desc { "default";
790 color: 0 0 0 0; 621 color: 0 0 0 0;
791 visible: 0;
792 } 622 }
793 description { state: "disabled" 0.0; 623 desc { "disabled"; inherit;
794 inherit: "default" 0.0; 624 visible: 0;
795 visible: 1;
796 } 625 }
797 } 626 }
798 } 627 }
799 programs { 628 programs {
800 EFL_UI_CLICKABLE_PART_BIND(event) 629 EFL_UI_CLICKABLE_PART_BIND("event")
801 program { 630 program { signal: "efl,state,selected"; source: "efl";
802 signal: "efl,state,selected"; source: "efl";
803 script { 631 script {
804 new Float:drag; 632 new Float:drag;
805 if (get_int(is_rtl) == 0) { 633 if (get_int(is_rtl) == 0) { drag = 100.0; }
806 drag = 100.0; 634 else { drag = 0.0; }
807 } else {
808 drag = 0.0;
809 }
810 set_drag(PART:"button", drag, 0.0); 635 set_drag(PART:"button", drag, 0.0);
811 } 636 }
812 } 637 }
813 program { 638 program { signal: "efl,state,unselected"; source: "efl";
814 signal: "efl,state,unselected"; source: "efl";
815 script { 639 script {
816 new Float:drag; 640 new Float:drag;
817 if (get_int(is_rtl) == 0) { 641 if (get_int(is_rtl) == 0) { drag = 0.0; }
818 drag = 0.0; 642 else { drag = 100.0; }
819 } else {
820 drag = 100.0;
821 }
822 set_drag(PART:"button", drag, 0.0); 643 set_drag(PART:"button", drag, 0.0);
823 } 644 }
824 } 645 }
825 program { 646 program { signal: "mouse,clicked,1"; source: "button";
826 signal: "mouse,clicked,1"; source: "button";
827 script { 647 script {
828 new Float:dx, Float:dy; 648 new Float:dx, Float:dy;
829 get_drag(PART:"button", dx, dy); 649 get_drag(PART:"button", dx, dy);
@@ -842,21 +662,18 @@ group { "efl/check:toggle"; data.item: "version" "123";
842 } 662 }
843 } 663 }
844 } 664 }
845 program { 665 program { signal: "drag"; source: "button";
846 signal: "drag"; source: "button";
847 script { 666 script {
848 set_int(is_drag, 1); 667 set_int(is_drag, 1);
849 } 668 }
850 } 669 }
851 program { 670 program { signal: "mouse,down,1"; source: "button";
852 signal: "mouse,down,1"; source: "button";
853 script { 671 script {
854 set_int(was_drag, 0); 672 set_int(was_drag, 0);
855 set_int(is_drag, 0); 673 set_int(is_drag, 0);
856 } 674 }
857 } 675 }
858 program { name: "drag_end"; 676 program { signal: "mouse,up,1"; source: "button";
859 signal: "mouse,up,1"; source: "button";
860 script { 677 script {
861 new Float:dx, Float:dy; 678 new Float:dx, Float:dy;
862 get_drag(PART:"button", dx, dy); 679 get_drag(PART:"button", dx, dy);
@@ -877,81 +694,45 @@ group { "efl/check:toggle"; data.item: "version" "123";
877 } 694 }
878 } 695 }
879 } 696 }
880 program { 697 program { signal: "mouse,down,1"; source: "button";
881 signal: "mouse,down,1"; source: "button";
882 action: STATE_SET "clicked" 0.0; 698 action: STATE_SET "clicked" 0.0;
883 target: "shadow_but"; 699 target: "base_but";
884 target: "glow_but"; 700 target: "efl.ontext";
701 target: "efl.offtext";
885 } 702 }
886 program { 703 program { signal: "mouse,up,1"; source: "button";
887 signal: "mouse,up,1"; source: "button";
888 action: STATE_SET "default" 0.0; 704 action: STATE_SET "default" 0.0;
889 target: "shadow_but"; 705 target: "base_but";
890 target: "glow_but"; 706 target: "efl.ontext";
707 target: "efl.offtext";
891 } 708 }
892 program { 709 program { signal: "efl,text,set"; source: "efl";
893 signal: "efl,text,set"; source: "efl"; 710 script { flag_set(LABEL); }
894 script {
895 new m = get_int(btmode);
896 m |= LABEL; set_int(btmode, m);
897 eval_mode(m);
898 }
899 } 711 }
900 program { 712 program { signal: "efl,text,unset"; source: "efl";
901 signal: "efl,text,unset"; source: "efl"; 713 script { flag_unset(LABEL); }
902 script {
903 new m = get_int(btmode);
904 m &= ~LABEL; set_int(btmode, m);
905 eval_mode(m);
906 }
907 } 714 }
908 program { 715 program { signal: "efl,content,set"; source: "efl";
909 signal: "efl,content,set"; source: "efl"; 716 script { flag_set(ICON); }
910 script {
911 new m = get_int(btmode);
912 m |= ICON; set_int(btmode, m);
913 eval_mode(m);
914 }
915 } 717 }
916 program { 718 program { signal: "efl,content,unset"; source: "efl";
917 signal: "efl,content,unset"; source: "efl"; 719 script { flag_unset(ICON); }
918 script {
919 new m = get_int(btmode);
920 m &= ~ICON; set_int(btmode, m);
921 eval_mode(m);
922 }
923 } 720 }
924 program { 721 program { signal: "efl,state,disabled"; source: "efl";
925 signal: "efl,state,disabled"; source: "efl"; 722 script { flag_set(DISABLE); }
926 script {
927 new m = get_int(btmode);
928 m |= DISABLE; set_int(btmode, m);
929 eval_mode(m);
930 }
931 } 723 }
932 program { 724 program { signal: "efl,state,enabled"; source: "efl";
933 signal: "efl,state,enabled"; source: "efl"; 725 script { flag_unset(DISABLE); }
934 script {
935 new m = get_int(btmode);
936 m &= ~DISABLE; set_int(btmode, m);
937 eval_mode(m);
938 }
939 } 726 }
940 program { 727 program { signal: "edje,state,rtl"; source: "edje";
941 signal: "edje,state,rtl"; source: "edje";
942 script { 728 script {
943 set_int(is_rtl, 1); 729 set_int(is_rtl, 1);
944 } 730 }
945 } 731 }
946 program { 732 program { signal: "edje,state,ltr"; source: "edje";
947 signal: "edje,state,ltr"; source: "edje";
948 script { 733 script {
949 set_int(is_rtl, 0); 734 set_int(is_rtl, 0);
950 } 735 }
951 } 736 }
952 } 737 }
953#undef ICON
954#undef LABEL
955#undef MASK
956#undef DISABLE
957} 738}
diff --git a/data/elementary/themes/edc/efl/cursor.edc b/data/elementary/themes/edc/efl/cursor.edc
index d59d4b8030..fbadbc852f 100644
--- a/data/elementary/themes/edc/efl/cursor.edc
+++ b/data/elementary/themes/edc/efl/cursor.edc
@@ -78,7 +78,8 @@
78// "watch" 78// "watch"
79// "xterm" 79// "xterm"
80 80
81group { name: "efl/cursor/hand1"; data.item: "version" "123"; 81group { name: "efl/cursor/hand1";
82 data.item: "version" "123";
82 images.image: "pointer_hand1.png" COMP; 83 images.image: "pointer_hand1.png" COMP;
83 parts { 84 parts {
84 part { name: "base"; mouse_events: 0; scale: 1; 85 part { name: "base"; mouse_events: 0; scale: 1;
@@ -104,7 +105,8 @@ group { name: "efl/cursor/hand1"; data.item: "version" "123";
104 } 105 }
105} 106}
106 107
107group { name: "efl/cursor/blank"; data.item: "version" "123"; 108group { name: "efl/cursor/blank";
109 data.item: "version" "123";
108 parts { 110 parts {
109 part { name: "efl.hotspot"; type: SWALLOW; 111 part { name: "efl.hotspot"; type: SWALLOW;
110 description { state: "default" 0.0; 112 description { state: "default" 0.0;
diff --git a/data/elementary/themes/edc/efl/datepicker.edc b/data/elementary/themes/edc/efl/datepicker.edc
index c84de86980..ce8986d6e0 100644
--- a/data/elementary/themes/edc/efl/datepicker.edc
+++ b/data/elementary/themes/edc/efl/datepicker.edc
@@ -17,60 +17,44 @@ Group: efl/datepicker/spin_button (@since 1.23)
17 Signal: efl,state,disabled 17 Signal: efl,state,disabled
18 Signal: efl,state,enabled 18 Signal: efl,state,enabled
19*/ 19*/
20group { "efl/datepicker"; data.item: "version" "123"; 20group { "efl/datepicker";
21 data.item: "version" "123";
21 parts { 22 parts {
22 spacer { "base"; 23 spacer { "base";
23 scale; 24 scale;
24 desc { "default"; 25 desc { "default";
25 min: 150 170; 26 min: 160 40;
26 }
27 }
28 rect { "base_bg";
29 scale;
30 desc { "default";
31 rel.to: "base";
32 color_class: "datepicker_bg";
33 } 27 }
34 } 28 }
35 spacer { "padding_bg_top"; 29 spacer { "padding_bg_top";
36 scale; 30 scale;
37 desc { "default"; 31 desc { "default";
38 min: 0 10; 32 min: 0 5;
39 max: -1 10; 33 max: -1 5;
40 fixed: 0 1; 34 fixed: 0 1;
41 rel1 { 35 rel.to: "base";
42 relative: 0.0 0.0; 36 rel1.relative: 0.0 0.0;
43 to: "base_bg"; 37 rel2.relative: 1.0 0.0;
44 }
45 rel2 {
46 relative: 1.0 0.0;
47 to: "base_bg";
48 }
49 align: 0.5 0.0; 38 align: 0.5 0.0;
50 } 39 }
51 } 40 }
52 spacer { "padding_bg_bottom"; 41 spacer { "padding_bg_bottom";
53 scale; 42 scale;
54 desc { "default"; 43 desc { "default";
55 min: 0 10; 44 min: 0 5;
56 max: -1 10; 45 max: -1 5;
57 fixed: 0 1; 46 fixed: 0 1;
58 rel1 { 47 rel.to: "base";
59 relative: 0.0 1.0; 48 rel1.relative: 0.0 1.0;
60 to: "base_bg"; 49 rel2.relative: 1.0 1.0;
61 }
62 rel2 {
63 relative: 1.0 1.0;
64 to: "base_bg";
65 }
66 align: 0.5 1.0; 50 align: 0.5 1.0;
67 } 51 }
68 } 52 }
69 spacer { "bg"; 53 spacer { "bg";
70 scale; 54 scale;
71 desc { "default"; 55 desc { "default";
72 min: 150 150; 56 min: 160 40;
73 max: 150 150; 57 max: 160 40;
74 rel1 { 58 rel1 {
75 relative: 0.0 1.0; 59 relative: 0.0 1.0;
76 to: "padding_bg_top"; 60 to: "padding_bg_top";
@@ -87,14 +71,9 @@ group { "efl/datepicker"; data.item: "version" "123";
87 min: 5 0; 71 min: 5 0;
88 max: 5 -1; 72 max: 5 -1;
89 fixed: 1 0; 73 fixed: 1 0;
90 rel1 { 74 rel.to: "bg";
91 relative: 0.0 0.0; 75 rel1.relative: 0.0 0.0;
92 to: "bg"; 76 rel2.relative: 0.0 1.0;
93 }
94 rel2 {
95 relative: 0.0 1.0;
96 to: "bg";
97 }
98 align: 0.0 0.0; 77 align: 0.0 0.0;
99 } 78 }
100 } 79 }
@@ -104,15 +83,9 @@ group { "efl/datepicker"; data.item: "version" "123";
104 min: 5 0; 83 min: 5 0;
105 max: 5 -1; 84 max: 5 -1;
106 fixed: 1 0; 85 fixed: 1 0;
107 rel2.to: "bg"; 86 rel.to: "bg";
108 rel1 { 87 rel1.relative: 1.0 0.0;
109 relative: 1.0 0.0; 88 rel2.relative: 1.0 1.0;
110 to: "bg";
111 }
112 rel2 {
113 relative: 1.0 1.0;
114 to: "bg";
115 }
116 align: 1.0 1.0; 89 align: 1.0 1.0;
117 } 90 }
118 } 91 }
@@ -120,13 +93,10 @@ group { "efl/datepicker"; data.item: "version" "123";
120 mouse; 93 mouse;
121 scale; 94 scale;
122 desc { "default"; 95 desc { "default";
123 fixed: 1 0; 96 fixed: 1 1;
124 min: 40 0; 97 min: 40 0;
125 rel1 { 98 rel.to: "padding_left";
126 relative: 1.0 0.0; 99 rel1.relative: 1.0 0.0;
127 to: "padding_left";
128 }
129 rel2.to: "padding_left";
130 align: 0.0 0.5; 100 align: 0.0 0.5;
131 } 101 }
132 } 102 }
@@ -134,13 +104,10 @@ group { "efl/datepicker"; data.item: "version" "123";
134 scale; 104 scale;
135 desc { "default"; 105 desc { "default";
136 fixed: 1 0; 106 fixed: 1 0;
137 min: 10 0; 107 min: 5 0;
138 max: 10 -1; 108 max: 5 -1;
139 rel1 { 109 rel.to: "efl.field0";
140 relative: 1.0 0.0; 110 rel1.relative: 1.0 0.0;
141 to: "efl.field0";
142 }
143 rel2.to: "efl.field0";
144 align: 0.0 0.5; 111 align: 0.0 0.5;
145 } 112 }
146 } 113 }
@@ -148,7 +115,7 @@ group { "efl/datepicker"; data.item: "version" "123";
148 mouse; 115 mouse;
149 scale; 116 scale;
150 desc { "default"; 117 desc { "default";
151 fixed: 1 0; 118 fixed: 1 1;
152 min: 40 0; 119 min: 40 0;
153 rel1 { 120 rel1 {
154 relative: 1.0 0.0; 121 relative: 1.0 0.0;
@@ -167,11 +134,8 @@ group { "efl/datepicker"; data.item: "version" "123";
167 fixed: 1 0; 134 fixed: 1 0;
168 min: 10 0; 135 min: 10 0;
169 max: 10 -1; 136 max: 10 -1;
170 rel1.to: "efl.field2"; 137 rel.to: "efl.field2";
171 rel2 { 138 rel2.relative: 0.0 1.0;
172 relative: 0.0 1.0;
173 to: "efl.field2";
174 }
175 align: 1.0 0.5; 139 align: 1.0 0.5;
176 } 140 }
177 } 141 }
@@ -179,13 +143,10 @@ group { "efl/datepicker"; data.item: "version" "123";
179 mouse; 143 mouse;
180 scale; 144 scale;
181 desc { "default"; 145 desc { "default";
182 fixed: 1 0; 146 fixed: 1 1;
183 min: 40 0; 147 min: 40 0;
184 rel1.to: "padding_right"; 148 rel.to: "padding_right";
185 rel2 { 149 rel2.relative: 0.0 1.0;
186 relative: 0.0 1.0;
187 to: "padding_right";
188 }
189 align: 1.0 0.5; 150 align: 1.0 0.5;
190 } 151 }
191 } 152 }
@@ -193,15 +154,15 @@ group { "efl/datepicker"; data.item: "version" "123";
193 repeat; 154 repeat;
194 desc { "default"; 155 desc { "default";
195 fixed: 1 1; 156 fixed: 1 1;
196 rel1.to: "bg"; 157 rel.to: "bg";
197 rel2.to: "bg";
198 color: 0 0 0 0; 158 color: 0 0 0 0;
199 } 159 }
200 } 160 }
201 } 161 }
202} 162}
203 163
204group { "efl/datepicker/spin_button"; data.item: "version" "123"; 164group { "efl/datepicker/spin_button";
165 data.item: "version" "123";
205 parts { 166 parts {
206 rect { "clip"; 167 rect { "clip";
207 desc { "default"; 168 desc { "default";
@@ -211,13 +172,7 @@ group { "efl/datepicker/spin_button"; data.item: "version" "123";
211 spacer { "base"; 172 spacer { "base";
212 scale; 173 scale;
213 desc { "default"; 174 desc { "default";
214 min: 40 150; 175 min: 20 60;
215 }
216 }
217 rect { "bg";
218 scale;
219 desc { "default";
220 color_class: "spinner_bg";
221 } 176 }
222 } 177 }
223 rect { "access"; 178 rect { "access";
@@ -225,8 +180,7 @@ group { "efl/datepicker/spin_button"; data.item: "version" "123";
225 desc { "default"; 180 desc { "default";
226 fixed: 1 1; 181 fixed: 1 1;
227 color: 0 0 0 0; 182 color: 0 0 0 0;
228 rel1.to: "base"; 183 rel.to: "base";
229 rel2.to: "base";
230 hid; 184 hid;
231 } 185 }
232 desc { "active"; 186 desc { "active";
@@ -238,8 +192,8 @@ group { "efl/datepicker/spin_button"; data.item: "version" "123";
238 scale; 192 scale;
239 desc { "default"; 193 desc { "default";
240 align: 0.5 0.0; 194 align: 0.5 0.0;
241 min: 40 40; 195 min: 20 20;
242 max: 40 40; 196 max: 20 20;
243 fixed: 1 1; 197 fixed: 1 1;
244 } 198 }
245 } 199 }
@@ -247,8 +201,8 @@ group { "efl/datepicker/spin_button"; data.item: "version" "123";
247 scale; 201 scale;
248 desc { "default"; 202 desc { "default";
249 align: 0.5 1.0; 203 align: 0.5 1.0;
250 min: 40 40; 204 min: 20 20;
251 max: 40 40; 205 max: 20 20;
252 fixed: 1 1; 206 fixed: 1 1;
253 } 207 }
254 } 208 }
@@ -256,8 +210,7 @@ group { "efl/datepicker/spin_button"; data.item: "version" "123";
256 clip: "clip"; 210 clip: "clip";
257 desc { "default"; 211 desc { "default";
258 fixed: 1 1; 212 fixed: 1 1;
259 rel1.to: "efl.text_button"; 213 rel.to: "efl.text_button";
260 rel2.to: "efl.text_button";
261 hid; 214 hid;
262 } 215 }
263 desc { "active"; 216 desc { "active";
@@ -277,8 +230,8 @@ group { "efl/datepicker/spin_button"; data.item: "version" "123";
277 to_y: "efl.dec_button"; 230 to_y: "efl.dec_button";
278 relative: 1.0 0.0; 231 relative: 1.0 0.0;
279 } 232 }
280 min: 0 70; 233 min: 0 20;
281 max: -1 70; 234 max: -1 20;
282 fixed: 0 1; 235 fixed: 0 1;
283 } 236 }
284 desc { "inactive"; 237 desc { "inactive";
@@ -300,51 +253,35 @@ group { "efl/datepicker/spin_button"; data.item: "version" "123";
300 } 253 }
301 } 254 }
302 programs { 255 programs {
303 program { "entry_active"; 256 program { signal: "efl,entry,visible,on"; source: "efl";
304 signal: "efl,entry,visible,on";
305 source: "efl";
306 action: STATE_SET "active"; 257 action: STATE_SET "active";
307 target: "efl.entry"; 258 target: "efl.entry";
308 } 259 }
309 program { "entry_inactive"; 260 program { signal: "efl,entry,visible,off"; source: "efl";
310 signal: "efl,entry,visible,off";
311 source: "efl";
312 action: STATE_SET "default"; 261 action: STATE_SET "default";
313 target: "efl.entry"; 262 target: "efl.entry";
314 } 263 }
315 program { "text_button_active"; 264 program { signal: "efl,button,visible,on"; source: "efl";
316 signal: "efl,button,visible,on";
317 source: "efl";
318 action: STATE_SET "default"; 265 action: STATE_SET "default";
319 target: "efl.text_button"; 266 target: "efl.text_button";
320 } 267 }
321 program { "text_button_inactive"; 268 program { signal: "efl,button,visible,off"; source: "efl";
322 signal: "efl,button,visible,off";
323 source: "efl";
324 action: STATE_SET "inactive"; 269 action: STATE_SET "inactive";
325 target: "efl.text_button"; 270 target: "efl.text_button";
326 } 271 }
327 program { "access_activate"; 272 program { signal: "efl,state,access,active"; source: "efl";
328 signal: "efl,state,access,active";
329 source: "efl";
330 action: STATE_SET "active"; 273 action: STATE_SET "active";
331 target: "access"; 274 target: "access";
332 } 275 }
333 program { "access_inactivate"; 276 program { signal: "efl,state,access,inactive"; source: "efl";
334 signal: "efl,state,access,inactive";
335 source: "efl";
336 action: STATE_SET "default"; 277 action: STATE_SET "default";
337 target: "access"; 278 target: "access";
338 } 279 }
339 program { "disable"; 280 program { signal: "efl,state,disabled"; source: "efl";
340 signal: "efl,state,disabled";
341 source: "efl";
342 action: STATE_SET "disabled"; 281 action: STATE_SET "disabled";
343 target: "disabler"; 282 target: "disabler";
344 } 283 }
345 program { "enable"; 284 program { signal: "efl,state,enabled"; source: "efl";
346 signal: "efl,state,enabled";
347 source: "efl";
348 action: STATE_SET "default"; 285 action: STATE_SET "default";
349 target: "disabler"; 286 target: "disabler";
350 } 287 }
diff --git a/data/elementary/themes/edc/efl/focus.edc b/data/elementary/themes/edc/efl/focus.edc
index 32b5e6e564..d135632570 100644
--- a/data/elementary/themes/edc/efl/focus.edc
+++ b/data/elementary/themes/edc/efl/focus.edc
@@ -5,9 +5,8 @@ Group: efl/focus_highlight/top (@since 1.23)
5 Signal: efl,state,animating,stopped 5 Signal: efl,state,animating,stopped
6Group: efl/focus_highlight/top:blank (@since 1.23) 6Group: efl/focus_highlight/top:blank (@since 1.23)
7*/ 7*/
8group { name: "efl/focus_highlight/top"; data.item: "version" "123"; 8group { name: "efl/focus_highlight/top";
9 images.image: "box_glow.png" COMP; 9 data.item: "version" "123";
10 images.image: "box_outline.png" COMP;
11 data.item: "animate" "on"; 10 data.item: "animate" "on";
12 script { 11 script {
13 public s_x, s_y, s_w, s_h; /* source */ 12 public s_x, s_y, s_w, s_h; /* source */
@@ -34,14 +33,14 @@ group { name: "efl/focus_highlight/top"; data.item: "version" "123";
34 33
35 public update_offset(x, y, w, h) { 34 public update_offset(x, y, w, h) {
36 set_state_val(PART:"base", STATE_REL1_OFFSET, x, y); 35 set_state_val(PART:"base", STATE_REL1_OFFSET, x, y);
37 set_state_val(PART:"base", STATE_REL2_OFFSET, x + w, y + h); 36 set_state_val(PART:"base", STATE_REL2_OFFSET, x + w - 1, y + h - 1);
38 } 37 }
39 38
40 public message(Msg_Type:type, id, ...) { 39 public message(Msg_Type:type, id, ...) {
41 if ((type == MSG_INT_SET) && (id == 1)) { 40 if ((type == MSG_INT_SET) && (id == 1)) {
42 new x1, y1, w1, h1, x2, y2, w2, h2; 41 new x1, y1, w1, h1, x2, y2, w2, h2;
43 new anim_id; 42 new anim_id;
44 43
45 anim_id = get_int(g_anim_id); 44 anim_id = get_int(g_anim_id);
46 if (anim_id != 0) { 45 if (anim_id != 0) {
47 cancel_anim(anim_id); 46 cancel_anim(anim_id);
@@ -70,7 +69,7 @@ group { name: "efl/focus_highlight/top"; data.item: "version" "123";
70 set_state_val(PART:"base", STATE_REL2, 0.0, 0.0); 69 set_state_val(PART:"base", STATE_REL2, 0.0, 0.0);
71 update_offset(x1, y1, w1, h1); 70 update_offset(x1, y1, w1, h1);
72 set_state(PART:"base", "custom", 0.0); 71 set_state(PART:"base", "custom", 0.0);
73 72
74 anim_id = anim(0.2, "animator1", 1); 73 anim_id = anim(0.2, "animator1", 1);
75 set_int(g_anim_id, anim_id); 74 set_int(g_anim_id, anim_id);
76 } 75 }
@@ -84,38 +83,106 @@ group { name: "efl/focus_highlight/top"; data.item: "version" "123";
84 } 83 }
85 part { name: "clip"; type: RECT; 84 part { name: "clip"; type: RECT;
86 description { state: "default" 0.0; 85 description { state: "default" 0.0;
87 rel1.to: "glow"; 86 rel.to: "base";
88 rel2.to: "glow"; 87 rel1.relative: -1.0 -1.0;
88 rel1.offset: -999 -999;
89 rel2.relative: 2.0 2.0;
90 rel2.offset: 999 999;
89 color: 255 255 255 0; 91 color: 255 255 255 0;
92 visible: 0;
90 } 93 }
91 description { state: "visible" 0.0; 94 description { state: "visible" 0.0;
92 inherit: "default" 0.0; 95 inherit: "default" 0.0;
93 color: 255 255 255 255; 96 color: 255 255 255 255;
97 visible: 1;
94 } 98 }
95 } 99 }
96 part { name: "glow"; mouse_events: 0; 100 part { name: "top"; type: RECT;
97 clip_to: "clip"; 101 clip_to: "clip";
102 scale: 1;
98 description { state: "default" 0.0; 103 description { state: "default" 0.0;
99 image.normal: "box_glow.png"; 104 rel.to: "base";
100 image.border: 12 12 12 12; 105 color: 51 153 255 255;
101 image.middle: 0; 106 rel2.relative: 1.0 0.0;
102 fill.smooth: 0; 107 min: 4 4;
103 rel1.to: "base"; 108 }
104 rel1.offset: -7 -7; 109 description { state: "hi" 0.0;
105 rel2.to: "base"; 110 inherit: "default" 0.0;
106 rel2.offset: 5 5; 111 color: 255 255 255 255;
107 } 112 }
108 } 113 }
109 part { name: "sel"; mouse_events: 0; 114 part { name: "topl"; type: RECT;
110 clip_to: "clip"; 115 clip_to: "clip";
116 scale: 1;
111 description { state: "default" 0.0; 117 description { state: "default" 0.0;
112 image.normal: "box_outline.png"; 118 rel.to: "top";
113 image.border: 12 12 12 12; 119 color: 51 153 255 255;
114 image.middle: 0; 120 rel1.relative: 0.0 1.0;
115 fill.smooth: 0; 121 rel2.relative: 0.0 1.0;
116 rel1.to: "glow"; 122 align: 0.0 0.0;
117 rel2.to: "glow"; 123 min: 4 4;
118 color: 255 255 255 0; 124 }
125 description { state: "hi" 0.0;
126 inherit: "default" 0.0;
127 color: 255 255 255 255;
128 }
129 }
130 part { name: "topr"; type: RECT;
131 clip_to: "clip";
132 scale: 1;
133 description { state: "default" 0.0;
134 rel.to: "top";
135 color: 51 153 255 255;
136 rel1.relative: 1.0 1.0;
137 rel2.relative: 1.0 1.0;
138 align: 1.0 0.0;
139 min: 4 4;
140 }
141 description { state: "hi" 0.0;
142 inherit: "default" 0.0;
143 color: 255 255 255 255;
144 }
145 }
146 part { name: "bot"; type: RECT;
147 clip_to: "clip";
148 scale: 1;
149 description { state: "default" 0.0;
150 rel.to: "base";
151 color: 51 153 255 255;
152 rel1.relative: 0.0 1.0;
153 min: 4 4;
154 }
155 description { state: "hi" 0.0;
156 inherit: "default" 0.0;
157 color: 255 255 255 255;
158 }
159 }
160 part { name: "botl"; type: RECT;
161 clip_to: "clip";
162 scale: 1;
163 description { state: "default" 0.0;
164 rel.to: "bot";
165 color: 51 153 255 255;
166 rel1.relative: 0.0 0.0;
167 rel2.relative: 0.0 0.0;
168 align: 0.0 1.0;
169 min: 4 4;
170 }
171 description { state: "hi" 0.0;
172 inherit: "default" 0.0;
173 color: 255 255 255 255;
174 }
175 }
176 part { name: "botr"; type: RECT;
177 clip_to: "clip";
178 scale: 1;
179 description { state: "default" 0.0;
180 rel.to: "bot";
181 color: 51 153 255 255;
182 rel1.relative: 1.0 0.0;
183 rel2.relative: 1.0 0.0;
184 align: 1.0 1.0;
185 min: 4 4;
119 } 186 }
120 description { state: "hi" 0.0; 187 description { state: "hi" 0.0;
121 inherit: "default" 0.0; 188 inherit: "default" 0.0;
@@ -124,8 +191,7 @@ group { name: "efl/focus_highlight/top"; data.item: "version" "123";
124 } 191 }
125 } 192 }
126 programs { 193 programs {
127 program { 194 program { signal: "efl,focus,visible,on"; source: "efl";
128 signal: "efl,focus,visible,on"; source: "efl";
129 action: ACTION_STOP; 195 action: ACTION_STOP;
130 target: "pulse"; 196 target: "pulse";
131 target: "pulse2"; 197 target: "pulse2";
@@ -141,8 +207,7 @@ group { name: "efl/focus_highlight/top"; data.item: "version" "123";
141 program { name: "go3"; 207 program { name: "go3";
142 action: SIGNAL_EMIT "efl,focus,visible,on,done" "efl"; 208 action: SIGNAL_EMIT "efl,focus,visible,on,done" "efl";
143 } 209 }
144 program { 210 program { signal: "efl,focus,visible,off"; source: "efl";
145 signal: "efl,focus,visible,off"; source: "efl";
146 action: STATE_SET "default" 0.0; 211 action: STATE_SET "default" 0.0;
147 transition: DECELERATE 0.4; 212 transition: DECELERATE 0.4;
148 target: "clip"; 213 target: "clip";
@@ -161,24 +226,34 @@ group { name: "efl/focus_highlight/top"; data.item: "version" "123";
161 action: STATE_SET "hi" 0.0; 226 action: STATE_SET "hi" 0.0;
162 transition: SINUSOIDAL 0.2; 227 transition: SINUSOIDAL 0.2;
163 in: 3.0 0.0; 228 in: 3.0 0.0;
164 target: "sel"; 229 target: "top";
230 target: "topl";
231 target: "topr";
232 target: "bot";
233 target: "botl";
234 target: "botr";
165 after: "pulse2"; 235 after: "pulse2";
166 } 236 }
167 program { name: "pulse2"; 237 program { name: "pulse2";
168 action: STATE_SET "default" 0.0; 238 action: STATE_SET "default" 0.0;
169 transition: SINUSOIDAL 0.4; 239 transition: SINUSOIDAL 0.4;
170 target: "sel"; 240 target: "top";
241 target: "topl";
242 target: "topr";
243 target: "bot";
244 target: "botl";
245 target: "botr";
171 after: "pulse"; 246 after: "pulse";
172 } 247 }
173 program { 248 program { signal: "efl,state,animating,stopped"; source: "efl";
174 signal: "efl,state,animating,stopped"; source: "efl";
175 action: STATE_SET "default" 0.0; 249 action: STATE_SET "default" 0.0;
176 target: "base"; 250 target: "base";
177 } 251 }
178 } 252 }
179} 253}
180 254
181group { name: "efl/focus_highlight/top:blank"; data.item: "version" "123"; 255group { name: "efl/focus_highlight/top:blank";
256 data.item: "version" "123";
182 parts { 257 parts {
183 } 258 }
184} 259}
diff --git a/data/elementary/themes/edc/efl/frame.edc b/data/elementary/themes/edc/efl/frame.edc
index 1844d25f22..7e967c48db 100644
--- a/data/elementary/themes/edc/efl/frame.edc
+++ b/data/elementary/themes/edc/efl/frame.edc
@@ -1,113 +1,85 @@
1group { name: "efl/frame"; data.item: "version" "123"; 1group { name: "efl/frame";
2 images.image: "shadow_square_tiny.png" COMP; 2 data.item: "version" "123";
3 images.image: "vgrad_med_curved.png" COMP; 3 images.image: "win_shad_flat.png" COMP;
4 images.image: "bevel_out.png" COMP;
5 images.image: "holes_tiny_vert.png" COMP;
6 parts { 4 parts {
7 part { name: "shadow"; mouse_events: 0; 5 part { name: "shadow"; type: RECT;
8 description { state: "default" 0.0; 6 description { state: "default" 0.0;
9 rel1.offset: -1 0; 7 rel.to: "_sh1";
10 rel2.offset: 0 1;
11 image.normal: "shadow_square_tiny.png";
12 image.border: 6 6 6 6;
13 fill.smooth: 0;
14 } 8 }
15 } 9 description { state: "hidden" 0.0;
16 part { name: "base"; type: RECT; 10 inherit;
17 description { state: "default" 0.0; 11 visible: 0;
18 rel1.relative: 0.0 1.0;
19 rel1.offset: 2 0;
20 rel1.to_y: "top";
21 rel2.offset: -3 -3;
22 color: 64 64 64 255;
23 } 12 }
24 } 13 }
25 part { name: "top"; 14 WIN_SHAD("base", "shadow", "win_shad_flat.png", 10, 10, 7, 14, 0.25);
26 description { state: "default" 0.0; 15 part { name: "base"; type: RECT;
27 image.normal: "vgrad_med_curved.png"; 16 scale: 1;
28 rel1.offset: 2 2;
29 rel2.to_y: "efl.text";
30 rel2.offset: -3 -1;
31 fill.smooth: 0;
32 TILED_HORIZ(120)
33 }
34 }
35 part { name: "edge1";
36 description { state: "default" 0.0; 17 description { state: "default" 0.0;
37 image.normal: "holes_tiny_vert.png"; 18 rel1.offset: 6 6;
38 rel1.offset: 4 0; 19 rel2.offset: -7 -7;
39 rel1.to_y: "efl.text"; 20 color: 80 80 80 255;
40 rel2.offset: 4 -1; 21 offscale;
41 rel2.relative: 0.0 1.0;
42 rel2.to_y: "efl.text";
43 align: 0.0 0.5;
44 FIXED_SIZE(3, 11)
45 } 22 }
46 } 23 }
47 part { name: "edge2"; 24 part { name: "top"; type: SPACER;
25 scale: 1;
48 description { state: "default" 0.0; 26 description { state: "default" 0.0;
49 image.normal: "holes_tiny_vert.png"; 27 rel1.to: "base";
50 rel1.offset: -5 0; 28 rel2.to_x: "base";
51 rel1.to_y: "efl.text";
52 rel1.relative: 1.0 0.0;
53 rel2.offset: -5 -1;
54 rel2.relative: 1.0 1.0;
55 rel2.to_y: "efl.text"; 29 rel2.to_y: "efl.text";
56 align: 1.0 0.5; 30 rel2.offset: -1 3;
57 FIXED_SIZE(3, 11) 31 offscale;
58 } 32 }
59 } 33 }
60 part { name: "efl.text"; type: TEXT; 34 part { name: "efl.text"; type: TEXT;
61 scale: 1; 35 scale: 1;
62 effect: SHADOW BOTTOM;
63 description { state: "default" 0.0; 36 description { state: "default" 0.0;
64 color_class: "frame"; 37 rel1.offset: 4 4;
65 rel1.relative: 1.0 0.0; 38 rel1.to: "base";
66 rel1.offset: 1 2; 39 rel2.relative: 1.0 0.0;
67 rel1.to_x: "edge1"; 40 rel2.offset: -5 4;
68 rel2.relative: 0.0 0.0; 41 rel2.to: "base";
69 rel2.offset: -3 1;
70 rel2.to_x: "edge2";
71 align: 0.0 0.0; 42 align: 0.0 0.0;
72 color: FN_COL_DISABLE; 43 color: 255 255 255 255;
73 text { font: FNBD; size: 10; 44 text { font: FNBD; size: 10;
74 text_class: "frame";
75 align: 0.0 0.0; 45 align: 0.0 0.0;
76 min: 0 1; 46 min: 0 1;
77 } 47 }
78 fixed: 0 1; 48 fixed: 0 1;
49 offscale;
79 } 50 }
80 } 51 }
81 part { name: "clip"; type: RECT; 52 part { name: "bg"; type: RECT;
53 scale: 1;
82 description { state: "default" 0.0; 54 description { state: "default" 0.0;
55 rel1.to_x: "base";
56 rel1.to_y: "top";
83 rel1.relative: 0.0 1.0; 57 rel1.relative: 0.0 1.0;
84 rel1.offset: 5 0; 58 rel2.to: "base";
85 rel1.to_y: "efl.text"; 59 color: 64 64 64 255;
86 rel2.offset: -7 -7; 60 }
61 }
62 part { name: "clip"; type: RECT;
63 description { state: "default" 0.0;
64 rel1.to: "bg";
65 rel2.to: "bg";
87 } 66 }
88 } 67 }
89 part { name: "efl.content"; type: SWALLOW; 68 part { name: "efl.content"; type: SWALLOW;
90 clip_to: "clip"; 69 clip_to: "clip";
70 scale: 1;
91 description { state: "default" 0.0; 71 description { state: "default" 0.0;
92 align: 0.0 1.0; 72 align: 0.0 1.0;
93 rel1.relative: 0.0 1.0; 73 rel.to: "bg";
94 rel1.offset: 5 0; 74 rel1.offset: 4 4;
95 rel1.to_y: "efl.text"; 75 rel2.offset: -5 -5;
96 rel2.offset: -7 -7; 76 offscale;
97 } 77 }
98 description { state: "collapsed" 0.0; 78 description { state: "collapsed" 0.0;
99 inherit: "default" 0.0; 79 inherit: "default" 0.0;
100 minmul: 1.0 0.0; 80 minmul: 1.0 0.0;
101 } 81 rel1.offset: 4 0;
102 } 82 rel2.offset: -5 -1;
103 part { name: "bevel"; mouse_events: 0;
104 description { state: "default" 0.0;
105 rel1.offset: 2 2;
106 rel2.offset: -3 -3;
107 image.normal: "bevel_out.png";
108 image.border: 1 1 1 1;
109 image.middle: 0;
110 fill.smooth: 0;
111 } 83 }
112 } 84 }
113 part { name: "event"; type: RECT; ignore_flags: ON_HOLD; 85 part { name: "event"; type: RECT; ignore_flags: ON_HOLD;
@@ -119,6 +91,7 @@ group { name: "efl/frame"; data.item: "version" "123";
119 } 91 }
120 } 92 }
121 programs { 93 programs {
94 EFL_UI_CLICKABLE_PART_BIND("event")
122 program { name: "collapse"; 95 program { name: "collapse";
123 action: STATE_SET "collapsed" 0.0; 96 action: STATE_SET "collapsed" 0.0;
124 target: "efl.content"; 97 target: "efl.content";
@@ -131,9 +104,10 @@ group { name: "efl/frame"; data.item: "version" "123";
131 transition: DECELERATE 0.3; 104 transition: DECELERATE 0.3;
132 after: "signal"; 105 after: "signal";
133 } 106 }
134 EFL_UI_CLICKABLE_PART_BIND("event") 107 program { signal: "mouse,up,1"; source: "event";
135 program { 108 action: SIGNAL_EMIT "efl,action,click" "efl";
136 signal: "efl,action,toggle"; source: "efl"; 109 }
110 program { signal: "efl,action,toggle"; source: "efl";
137 script { 111 script {
138 new st[31]; 112 new st[31];
139 new Float:vl; 113 new Float:vl;
@@ -144,8 +118,7 @@ group { name: "efl/frame"; data.item: "version" "123";
144 run_program(PROGRAM:"expand"); 118 run_program(PROGRAM:"expand");
145 } 119 }
146 } 120 }
147 program { 121 program { signal: "efl,action,switch"; source: "efl";
148 signal: "efl,action,switch"; source: "efl";
149 script { 122 script {
150 new st[31]; 123 new st[31];
151 new Float:vl; 124 new Float:vl;
diff --git a/data/elementary/themes/edc/efl/grid.edc b/data/elementary/themes/edc/efl/grid.edc
index d312ee71db..5879f543ef 100644
--- a/data/elementary/themes/edc/efl/grid.edc
+++ b/data/elementary/themes/edc/efl/grid.edc
@@ -41,265 +41,163 @@ group { "efl/view_grid";
41 data.item: "version" "123"; 41 data.item: "version" "123";
42} 42}
43 43
44group { "efl/grid_item"; data.item: "version" "124"; 44group { "efl/grid_item";
45 data.item: "version" "124";
45 data.item: "selectraise" "on"; 46 data.item: "selectraise" "on";
46 data.item: "focusraise" "on"; 47 data.item: "focusraise" "on";
47 images.image: "bevel_dark_out.png" COMP; 48 data.item: "texts" "elm.text";
48 images.image: "shadow_rounded_horiz.png" COMP;
49 images.image: "vgrad_med_dark.png" COMP;
50 images.image: "bevel_out.png" COMP;
51 images.image: "shine.png" COMP;
52 parts { 49 parts {
50//---------------------------------------------------------------------------
51#define BASEP() \
52 part { name: "base"; type: RECT; mouse_events: 0; \
53 description { state: "default" 0.0; \
54 color: 64 64 64 255; \
55 } \
56 } \
57 part { name: "sel_base"; type: RECT; mouse_events: 0; \
58 description { state: "default" 0.0; \
59 color: 51 153 255 255; \
60 visible: 0; \
61 } \
62 description { state: "selected" 0.0; \
63 inherit: "default" 0.0; \
64 visible: 1; \
65 } \
66 } \
67 program { signal: "efl,state,selected"; source: "efl"; \
68 action: STATE_SET "selected" 0.0; \
69 target: "sel_base"; \
70 } \
71 program { signal: "efl,state,unselected"; source: "efl"; \
72 action: STATE_SET "default" 0.0; \
73 target: "sel_base"; \
74 } \
75 program { signal: "efl,state,disabled"; source: "efl"; \
76 action: STATE_SET "disabled" 0.0; \
77 target: "event"; \
78 } \
79 program { signal: "efl,state,enabled"; source: "efl"; \
80 action: STATE_SET "default" 0.0; \
81 target: "event"; \
82 }
83#define TOPP() \
84 part { name: "event"; type: RECT; \
85 repeat_events: 1; \
86 description { state: "default" 0.0; \
87 color: 0 0 0 0; \
88 } \
89 description { state: "disabled" 0.0; \
90 inherit: "default" 0.0; \
91 visible: 0; \
92 } \
93 } \
94 part { name: "event_block"; type: RECT; \
95 description { state: "default" 0.0; \
96 color: 0 0 0 0; \
97 visible: 0; \
98 } \
99 description { state: "disabled" 0.0; \
100 inherit: "default" 0.0; \
101 visible: 1; \
102 } \
103 } \
104 program { signal: "efl,state,disabled"; source: "efl"; \
105 action: STATE_SET "disabled" 0.0; \
106 target: "event_block"; \
107 } \
108 program { signal: "efl,state,enabled"; source: "efl"; \
109 action: STATE_SET "default" 0.0; \
110 target: "event_block"; \
111 }
112//---------------------------------------------------------------------------
113 BASEP()
53 114
54 // BASE PARTS // 115 //##//
55 rect { "base"; mouse; 116 part { name: "efl.text"; type: TEXT; mouse_events: 0;
56 desc { "default";
57 }
58 }
59 image { "bevel"; nomouse;
60 desc { "default";
61 image.normal: "bevel_dark_out.png";
62 image.border: 2 2 2 2;
63 image.middle: 0;
64 fill.smooth: 0;
65 }
66 }
67 image { "sel_shadow"; nomouse;
68 desc { "default";
69 image.normal: "shadow_rounded_horiz.png";
70 image.border: 0 0 9 9;
71 rel1.offset: 0 -4;
72 rel2.offset: -1 5;
73 fill.smooth: 0;
74 hid;
75 }
76 desc { "selected";
77 inherit: "default";
78 vis;
79 }
80 }
81 image { "sel_base"; nomouse;
82 desc { "default";
83 image.normal: "vgrad_med_dark.png";
84 fill.smooth: 0;
85 hid;
86 TILED_HORIZ(120)
87 }
88 desc { "selected";
89 inherit: "default";
90 vis;
91 }
92 }
93 image { "sel_bevel"; nomouse;
94 desc { "default";
95 image.normal: "bevel_out.png";
96 image.border: 2 2 2 2;
97 image.middle: 0;
98 fill.smooth: 0;
99 hid;
100 }
101 desc { "selected";
102 inherit: "default";
103 vis;
104 }
105 }
106 // BASE PARTS //
107
108 // TEXT PARTS //
109 text { "efl.text"; nomouse;
110 effect: SHADOW BOTTOM;
111 scale: 1; 117 scale: 1;
112 desc { "default"; 118 description { state: "default" 0.0;
113 fixed: 0 1; 119 fixed: 0 1;
114 rel1.relative: 0.0 1.0; 120 rel1.relative: 0.0 1.0;
115 rel1.offset: 5 -5; 121 rel1.offset: 4 -5;
116 rel2.relative: 1.0 1.0;
117 rel2.offset: -5 -5; 122 rel2.offset: -5 -5;
118 color: FN_COL_DEFAULT; 123 color: 160 160 160 255;
119 color_class: "grid_item";
120 align: 0.5 1.0; 124 align: 0.5 1.0;
125 offscale;
121 text { font: FN; size: 10; 126 text { font: FN; size: 10;
122 min: 0 1; 127 min: 0 1;
123 align: 0.5 1.0; 128 align: 0.5 1.0;
124 text_class: "grid_item"; 129 text_class: "grid_item";
125 } 130 }
126 } 131 }
127 desc { "selected"; 132 description { state: "selected" 0.0;
128 inherit: "default"; 133 inherit: "default" 0.0;
129 hid; 134 color: 255 255 255 255;
130 } 135 }
131 desc { "disabled"; 136 description { state: "disabled" 0.0;
132 inherit: "default"; 137 inherit: "default" 0.0;
133 hid; 138 color: 80 80 80 255;
134 } 139 }
135 } 140 }
136 text { "label2"; nomouse; 141 program { signal: "efl,state,selected"; source: "efl";
137 effect: SHADOW BOTTOM; 142 action: STATE_SET "selected" 0.0;
138 scale: 1; 143 target: "efl.text";
139 desc { "default";
140 rel1.to: "efl.text";
141 rel2.to: "efl.text";
142 color: FN_COL_DISABLE;
143 color_class: "grid_item_disabled";
144 text { font: FN; size: 10;
145 text_source: "efl.text";
146 align: 0.5 1.0;
147 text_class: "grid_item";
148 }
149 hid;
150 }
151 desc { "selected";
152 inherit: "default";
153 hid;
154 }
155 desc { "disabled";
156 inherit: "default";
157 vis;
158 }
159 } 144 }
160 text { "label3"; nomouse; 145 program { signal: "efl,state,unselected"; source: "efl";
161 effect: GLOW; 146 action: STATE_SET "default" 0.0;
162 scale: 1; 147 target: "efl.text";
163 desc { "default";
164 rel1.offset: -2 -2;
165 rel1.to: "efl.text";
166 rel2.offset: 1 0;
167 rel2.to: "efl.text";
168 color: FN_COL_HIGHLIGHT;
169 color_class: "grid_item_selected";
170 text { font: FN; size: 10;
171 text_source: "efl.text";
172 align: 0.5 1.0;
173 text_class: "grid_item";
174 }
175 hid;
176 }
177 desc { "selected";
178 inherit: "default";
179 vis;
180 }
181 desc { "disabled";
182 inherit: "default";
183 hid;
184 }
185 } 148 }
186 // TEXT PARTS // 149 program { signal: "efl,state,disabled"; source: "efl";
187 150 action: STATE_SET "disabled" 0.0;
188 // CONTENT PARTS // 151 target: "efl.text";
189 rect { "icon_area"; 152 target: "icon_area";
190 desc { "default"; 153 }
191 fixed: 1 0; 154 program { signal: "efl,state,enabled"; source: "efl";
192 rel1.offset: 2 2; 155 action: STATE_SET "default" 0.0;
156 target: "efl.text";
157 target: "icon_area";
158 }
159 //##//
160 part { name: "icon_area"; type: RECT;
161 scale: 1;
162 description { state: "default" 0.0;
163 rel1.offset: 4 4;
193 rel2.to_y: "efl.text"; 164 rel2.to_y: "efl.text";
194 rel2.relative: 1.0 0.0; 165 rel2.relative: 1.0 0.0;
195 rel2.offset: -3 -3; 166 rel2.offset: -5 -5;
167 offscale;
196 } 168 }
197 desc { "disabled"; 169 description { state: "disabled" 0.0;
198 inherit: "default"; 170 inherit: "default" 0.0;
199 color: 255 255 255 64; 171 color: 255 255 255 64;
200 } 172 }
201 } 173 }
202 rect { "event"; 174 part { name: "efl.icon"; type: SWALLOW;
203 desc { "default";
204 color: 0 0 0 0;
205 }
206 desc { "disabled";
207 inherit: "default";
208 hid;
209 }
210 }
211 swallow { "efl.icon";
212 clip_to: "icon_area"; 175 clip_to: "icon_area";
213 desc { "default";