summaryrefslogtreecommitdiff
path: root/data/elementary/themes
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2020-06-21 21:01:57 +0100
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2020-06-21 21:01:57 +0100
commita17e8a1221658d4cf26d3f2e0297f2335728901d (patch)
tree8fe9ef0d91b7765c1d00760ddf19d519c0db2728 /data/elementary/themes
parent55465f8cd7cc47aecda76ab93e6e0b959348aae8 (diff)
TH - gengrid
Diffstat (limited to 'data/elementary/themes')
-rw-r--r--data/elementary/themes/edc/elm/check.edc5
-rw-r--r--data/elementary/themes/edc/elm/gengrid.edc812
-rw-r--r--data/elementary/themes/edc/elm/genlist.edc2
-rw-r--r--data/elementary/themes/edc/elm/photo.edc9
-rw-r--r--data/elementary/themes/edc/elm/radio.edc3
-rw-r--r--data/elementary/themes/macros.edc2
6 files changed, 282 insertions, 551 deletions
diff --git a/data/elementary/themes/edc/elm/check.edc b/data/elementary/themes/edc/elm/check.edc
index 038e5e9027..eaa0c8b0de 100644
--- a/data/elementary/themes/edc/elm/check.edc
+++ b/data/elementary/themes/edc/elm/check.edc
@@ -49,6 +49,7 @@ group { name: "elm/check/base/default";
49 desc { "visible"; inherit; 49 desc { "visible"; inherit;
50 fixed: 1 0; 50 fixed: 1 0;
51 aspect: 1.0 1.0; 51 aspect: 1.0 1.0;
52 min: ICMIN ICMIN;
52 visible: 1; 53 visible: 1;
53 } 54 }
54 desc { "icononly"; inherit; 55 desc { "icononly"; inherit;
@@ -141,7 +142,7 @@ group { name: "elm/check/base/default";
141 text { "elm.text"; nomouse; 142 text { "elm.text"; nomouse;
142 scale: 1; 143 scale: 1;
143 desc { "default"; 144 desc { "default";
144 fixed: 1 1; 145 fixed: 0 1;
145 color: 160 160 160 255; 146 color: 160 160 160 255;
146 rel1.offset: 0 4; 147 rel1.offset: 0 4;
147 rel1.relative: 1.0 0.0; 148 rel1.relative: 1.0 0.0;
@@ -535,7 +536,7 @@ group { name: "elm/check/base/toggle";
535 text { "elm.text"; nomouse; 536 text { "elm.text"; nomouse;
536 scale: 1; 537 scale: 1;
537 desc { "default"; 538 desc { "default";
538 fixed: 1 1; 539 fixed: 0 1;
539 color: 160 160 160 255; 540 color: 160 160 160 255;
540 rel1.offset: 0 4; 541 rel1.offset: 0 4;
541 rel1.relative: 1.0 0.0; 542 rel1.relative: 1.0 0.0;
diff --git a/data/elementary/themes/edc/elm/gengrid.edc b/data/elementary/themes/edc/elm/gengrid.edc
index 5f375f9eae..ecf71e6cbc 100644
--- a/data/elementary/themes/edc/elm/gengrid.edc
+++ b/data/elementary/themes/edc/elm/gengrid.edc
@@ -7,179 +7,93 @@ group { name: "elm/gengrid/item/default/default";
7 data.item: "focusraise" "on"; 7 data.item: "focusraise" "on";
8 data.item: "texts" "elm.text"; 8 data.item: "texts" "elm.text";
9 data.item: "contents" "elm.swallow.icon elm.swallow.end"; 9 data.item: "contents" "elm.swallow.icon elm.swallow.end";
10#define IMGP() \
11 images.image: "bevel_dark_out.png" COMP; \
12 images.image: "shadow_rounded_horiz.png" COMP; \
13 images.image: "vgrad_med_dark.png" COMP; \
14 images.image: "bevel_out.png" COMP; \
15 images.image: "shine.png" COMP;
16 IMGP()
17 parts { 10 parts {
18//--------------------------------------------------------------------------- 11//---------------------------------------------------------------------------
19#define BASEP() \ 12#define BASEP() \
20 part { name: "event"; type: RECT; \ 13 part { name: "event"; type: RECT; \
21 description { state: "default" 0.0; \ 14 description { state: "default" 0.0; \
22 color: 0 0 0 0; \ 15 color: 0 0 0 0; \
23 } \
24 description { state: "disabled" 0.0; \
25 inherit: "default" 0.0; \
26 visible: 0; \
27 } \
28 } \ 16 } \
29 part { name: "base"; type: RECT; mouse_events: 0; \ 17 description { state: "disabled" 0.0; \
30 description { state: "default" 0.0; \ 18 inherit: "default" 0.0; \
31 color: 64 64 64 255; \ 19 visible: 0; \
32 color_class: "list_item_base"; \
33 } \
34 description { state: "odd" 0.0; \
35 color: 56 56 56 255; \
36 color_class: "list_item_base_odd"; \
37 } \
38 } \ 20 } \
39 program { \ 21 } \
40 signal: "elm,state,odd"; source: "elm"; \ 22 part { name: "base"; type: RECT; mouse_events: 0; \
41 action: STATE_SET "odd" 0.0; \ 23 description { state: "default" 0.0; \
42 target: "base"; \ 24 color: 64 64 64 255; \
43 } \ 25 } \
44 program { \ 26 description { state: "odd" 0.0; \
45 signal: "elm,state,even"; source: "elm"; \ 27 color: 56 56 56 255; \
46 action: STATE_SET "default" 0.0; \
47 target: "base"; \
48 } \ 28 } \
49 part { name: "bevel"; mouse_events: 0; \ 29 } \
50 description { state: "default" 0.0; \ 30 program { signal: "elm,state,odd"; source: "elm"; \
51 image.normal: "bevel_dark_out.png"; \ 31 action: STATE_SET "odd" 0.0; \
52 image.border: 2 2 2 2; \ 32 target: "base"; \
53 image.middle: 0; \ 33 } \
54 fill.smooth: 0; \ 34 program { signal: "elm,state,even"; source: "elm"; \
55 } \ 35 action: STATE_SET "default" 0.0; \
36 target: "base"; \
37 } \
38 part { name: "sel_base"; type: RECT; mouse_events: 0; \
39 description { state: "default" 0.0; \
40 color: 51 153 255 255; \
41 visible: 0; \
56 } \ 42 } \
57 part { name: "sel_shadow"; mouse_events: 0; \ 43 description { state: "selected" 0.0; \
58 description { state: "default" 0.0; \ 44 inherit: "default" 0.0; \
59 image.normal: "shadow_rounded_horiz.png"; \ 45 visible: 1; \
60 image.border: 0 0 9 9; \
61 rel1.offset: 0 -4; \
62 rel2.offset: -1 5; \
63 fill.smooth: 0; \
64 visible: 0; \
65 } \
66 description { state: "selected" 0.0; \
67 inherit: "default" 0.0; \
68 visible: 1; \
69 } \
70 } \ 46 } \
71 part { name: "sel_base"; mouse_events: 0; \ 47 } \
72 description { state: "default" 0.0; \ 48 program { signal: "elm,state,selected"; source: "elm"; \
73 image.normal: "vgrad_med_dark.png"; \ 49 action: STATE_SET "selected" 0.0; \
74 fill.smooth: 0; \ 50 target: "sel_base"; \
75 visible: 0; \ 51 } \
76 TILED_HORIZ(120) \ 52 program { signal: "elm,state,unselected"; source: "elm"; \
77 } \ 53 action: STATE_SET "default" 0.0; \
78 description { state: "selected" 0.0; \ 54 target: "sel_base"; \
79 inherit: "default" 0.0; \ 55 } \
80 visible: 1; \ 56 program { signal: "elm,state,disabled"; source: "elm"; \
81 } \ 57 action: STATE_SET "disabled" 0.0; \
82 } \ 58 target: "event"; \
83 part { name: "sel_bevel"; mouse_events: 0; \ 59 } \
84 description { state: "default" 0.0; \ 60 program { signal: "elm,state,enabled"; source: "elm"; \
85 image.normal: "bevel_out.png"; \ 61 action: STATE_SET "default" 0.0; \
86 image.border: 2 2 2 2; \ 62 target: "event"; \
87 image.middle: 0; \ 63 }
88 fill.smooth: 0; \
89 visible: 0; \
90 } \
91 description { state: "selected" 0.0; \
92 inherit: "default" 0.0; \
93 visible: 1; \
94 } \
95 } \
96 program { \
97 signal: "elm,state,selected"; source: "elm"; \
98 action: STATE_SET "selected" 0.0; \
99 target: "sel_shadow"; \
100 target: "sel_base"; \
101 target: "sel_bevel"; \
102 } \
103 program { \
104 signal: "elm,state,unselected"; source: "elm"; \
105 action: STATE_SET "default" 0.0; \
106 target: "sel_shadow"; \
107 target: "sel_base"; \
108 target: "sel_bevel"; \
109 } \
110 program { \
111 signal: "elm,state,disabled"; source: "elm"; \
112 action: STATE_SET "disabled" 0.0; \
113 target: "event"; \
114 } \
115 program { \
116 signal: "elm,state,enabled"; source: "elm"; \
117 action: STATE_SET "default" 0.0; \
118 target: "event"; \
119 }
120#define TOPP() \ 64#define TOPP() \
121 part { name: "sel_shine"; mouse_events: 0; \ 65 part { name: "event_block"; type: RECT; \
122 description { state: "default" 0.0; \ 66 description { state: "default" 0.0; \
123 image.normal: "shine.png"; \ 67 color: 0 0 0 0; \
124 rel1.offset: 0 -2; \ 68 visible: 0; \
125 rel1.to: "sel_base"; \
126 rel2.relative: 1.0 0.0; \
127 rel2.offset: -1 2; \
128 rel2.to: "sel_base"; \
129 visible: 0; \
130 FIXED_SIZE(69, 5) \
131 } \
132 description { state: "selected" 0.0; \
133 inherit: "default" 0.0; \
134 visible: 1; \
135 } \
136 } \
137 part { name: "event_block"; type: RECT; \
138 description { state: "default" 0.0; \
139 color: 0 0 0 0; \
140 visible: 0; \
141 } \
142 description { state: "disabled" 0.0; \
143 inherit: "default" 0.0; \
144 visible: 1; \
145 } \
146 } \
147 program { \
148 signal: "elm,state,selected"; source: "elm"; \
149 action: STATE_SET "selected" 0.0; \
150 target: "sel_shine"; \
151 } \ 69 } \
152 program { \ 70 description { state: "disabled" 0.0; \
153 signal: "elm,state,unselected"; source: "elm"; \ 71 inherit: "default" 0.0; \
154 action: STATE_SET "default" 0.0; \ 72 visible: 1; \
155 target: "sel_shine"; \
156 } \ 73 } \
157 program { \ 74 } \
158 signal: "elm,state,disabled"; source: "elm"; \ 75 program { signal: "elm,state,disabled"; source: "elm"; \
159 action: STATE_SET "disabled" 0.0; \ 76 action: STATE_SET "disabled" 0.0; \
160 target: "event_block"; \ 77 target: "event_block"; \
161 } \ 78 } \
162 program { \ 79 program { signal: "elm,state,enabled"; source: "elm"; \
163 signal: "elm,state,enabled"; source: "elm"; \ 80 action: STATE_SET "default" 0.0; \
164 action: STATE_SET "default" 0.0; \ 81 target: "event_block"; \
165 target: "event_block"; \ 82 }
166 }
167//--------------------------------------------------------------------------- 83//---------------------------------------------------------------------------
168 BASEP() 84 BASEP()
169 85
170 //##// 86 //##//
171 part { name: "elm.text"; type: TEXT; mouse_events: 0; 87 part { name: "elm.text"; type: TEXT; mouse_events: 0;
172 effect: SHADOW BOTTOM;
173 scale: 1; 88 scale: 1;
174 description { state: "default" 0.0; 89 description { state: "default" 0.0;
175 fixed: 0 1; 90 fixed: 0 1;
176 rel1.relative: 0.0 1.0; 91 rel1.relative: 0.0 1.0;
177 rel1.offset: 5 -5; 92 rel1.offset: 4 -5;
178 rel2.relative: 1.0 1.0;
179 rel2.offset: -5 -5; 93 rel2.offset: -5 -5;
180 color: FN_COL_DEFAULT; 94 color: 160 160 160 255;
181 color_class: "grid_item";
182 align: 0.5 1.0; 95 align: 0.5 1.0;
96 offscale;
183 text { font: FN; size: 10; 97 text { font: FN; size: 10;
184 min: 0 1; 98 min: 0 1;
185 align: 0.5 1.0; 99 align: 0.5 1.0;
@@ -188,101 +102,40 @@ group { name: "elm/gengrid/item/default/default";
188 } 102 }
189 description { state: "selected" 0.0; 103 description { state: "selected" 0.0;
190 inherit: "default" 0.0; 104 inherit: "default" 0.0;
191 visible: 0; 105 color: 255 255 255 255;
192 }
193 description { state: "disabled" 0.0;
194 inherit: "default" 0.0;
195 visible: 0;
196 }
197 }
198 part { name: "label2"; type: TEXT; mouse_events: 0;
199 effect: SHADOW BOTTOM;
200 scale: 1;
201 description { state: "default" 0.0;
202 rel1.to: "elm.text";
203 rel2.to: "elm.text";
204 color: FN_COL_DISABLE;
205 color_class: "grid_item_disabled";
206 text { font: FN; size: 10;
207 text_source: "elm.text";
208 align: 0.5 1.0;
209 text_class: "grid_item";
210 }
211 visible: 0;
212 }
213 description { state: "selected" 0.0;
214 inherit: "default" 0.0;
215 visible: 0;
216 }
217 description { state: "disabled" 0.0;
218 inherit: "default" 0.0;
219 visible: 1;
220 }
221 }
222 part { name: "label3"; type: TEXT; mouse_events: 0;
223 effect: GLOW;
224 scale: 1;
225 description { state: "default" 0.0;
226 rel1.offset: -2 -2;
227 rel1.to: "elm.text";
228 rel2.offset: 1 0;
229 rel2.to: "elm.text";
230 color: FN_COL_HIGHLIGHT;
231 color_class: "grid_item_selected";
232 text { font: FN; size: 10;
233 text_source: "elm.text";
234 align: 0.5 1.0;
235 text_class: "grid_item";
236 }
237 visible: 0;
238 }
239 description { state: "selected" 0.0;
240 inherit: "default" 0.0;
241 visible: 1;
242 } 106 }
243 description { state: "disabled" 0.0; 107 description { state: "disabled" 0.0;
244 inherit: "default" 0.0; 108 inherit: "default" 0.0;
245 visible: 0; 109 color: 80 80 80 255;
246 } 110 }
247 } 111 }
248 program { 112 program { signal: "elm,state,selected"; source: "elm";
249 signal: "elm,state,selected"; source: "elm";
250 action: STATE_SET "selected" 0.0; 113 action: STATE_SET "selected" 0.0;
251 target: "elm.text"; 114 target: "elm.text";
252 target: "label2";
253 target: "label3";
254 } 115 }
255 program { 116 program { signal: "elm,state,unselected"; source: "elm";
256 signal: "elm,state,unselected"; source: "elm";
257 action: STATE_SET "default" 0.0; 117 action: STATE_SET "default" 0.0;
258 target: "elm.text"; 118 target: "elm.text";
259 target: "label2";
260 target: "label3";
261 } 119 }
262 program { 120 program { signal: "elm,state,disabled"; source: "elm";
263 signal: "elm,state,disabled"; source: "elm";
264 action: STATE_SET "disabled" 0.0; 121 action: STATE_SET "disabled" 0.0;
265 target: "elm.text"; 122 target: "elm.text";
266 target: "label2";
267 target: "label3";
268 target: "icon_area"; 123 target: "icon_area";
269 } 124 }
270 program { 125 program { signal: "elm,state,enabled"; source: "elm";
271 signal: "elm,state,enabled"; source: "elm";
272 action: STATE_SET "default" 0.0; 126 action: STATE_SET "default" 0.0;
273 target: "elm.text"; 127 target: "elm.text";
274 target: "label2";
275 target: "label3";
276 target: "icon_area"; 128 target: "icon_area";
277 } 129 }
278 //##// 130 //##//
279 part { name: "icon_area"; type: RECT; 131 part { name: "icon_area"; type: RECT;
132 scale: 1;
280 description { state: "default" 0.0; 133 description { state: "default" 0.0;
281 fixed: 1 0; 134 rel1.offset: 4 4;
282 rel1.offset: 2 2;
283 rel2.to_y: "elm.swallow.pad"; 135 rel2.to_y: "elm.swallow.pad";
284 rel2.relative: 1.0 0.0; 136 rel2.relative: 1.0 0.0;
285 rel2.offset: -3 -3; 137 rel2.offset: -5 -5;
138 offscale;
286 } 139 }
287 description { state: "disabled" 0.0; 140 description { state: "disabled" 0.0;
288 inherit: "default" 0.0; 141 inherit: "default" 0.0;
@@ -290,34 +143,40 @@ group { name: "elm/gengrid/item/default/default";
290 } 143 }
291 } 144 }
292 part { name: "elm.swallow.pad"; type: SWALLOW; 145 part { name: "elm.swallow.pad"; type: SWALLOW;
146 scale: 1;
293 description { state: "default" 0.0; 147 description { state: "default" 0.0;
294 fixed: 0 1; 148 fixed: 0 1;
295 align: 0.0 1.0; 149 align: 0.0 1.0;
296 rel1.to_y: "elm.text"; 150 rel1.to_y: "elm.text";
151 rel2.offset: 0 0;
297 rel2.to_y: "elm.text"; 152 rel2.to_y: "elm.text";
298 rel2.relative: 1.0 0.0; 153 rel2.relative: 1.0 0.0;
154 rel2.offset: -1 0;
155 offscale;
299 } 156 }
300 } 157 }
301 part { name: "elm.swallow.icon"; type: SWALLOW; 158 part { name: "elm.swallow.icon"; type: SWALLOW;
302 clip_to: "icon_area"; 159 clip_to: "icon_area";
303 description { state: "default" 0.0; 160 description { state: "default" 0.0;
304 rel1.to: "icon_area"; 161 rel.to: "icon_area";
305 rel2.to: "icon_area";
306 } 162 }
307 } 163 }
308 part { name: "elm.swallow.end"; type: SWALLOW; 164 part { name: "elm.swallow.end"; type: SWALLOW;
165 scale: 1;
309 clip_to: "icon_area"; 166 clip_to: "icon_area";
310 description { state: "default" 0.0; 167 description { state: "default" 0.0;
311 fixed: 1 1; 168 min: ICMIN ICMIN;
312 align: 1.0 0.0; 169 align: 1.0 0.0;
170 rel.to: "icon_area";
313 rel1.relative: 1.0 0.0; 171 rel1.relative: 1.0 0.0;
314 rel1.offset: -3 2; 172 rel1.offset: -5 4;
315 rel2.relative: 1.0 0.0; 173 rel2.relative: 1.0 0.0;
316 rel2.offset: -3 2; 174 rel2.offset: -5 4;
175 offscale;
317 } 176 }
318 } 177 }
319 //##// 178 //##//
320 179
321 TOPP() 180 TOPP()
322 } 181 }
323} 182}
@@ -328,7 +187,7 @@ group { name: "elm/gengrid/item/default_style/default";
328 data.item: "texts" "elm.text"; 187 data.item: "texts" "elm.text";
329 data.item: "contents" "elm.swallow.icon elm.swallow.end"; 188 data.item: "contents" "elm.swallow.icon elm.swallow.end";
330 styles.style { name: "gengrid_style"; 189 styles.style { name: "gengrid_style";
331 base: "font="FN" font_size=10 align=left color=#fff style=shadow,bottom shadow_color=#00000080 text_class=list_item ellipsis=1.0"; 190 base: "font="FN" font_size=10 align=left color=#a0a0a0 text_class=list_item ellipsis=1.0";
332 tag: "br" "\n"; 191 tag: "br" "\n";
333 tag: "ps" "ps"; 192 tag: "ps" "ps";
334 tag: "hilight" "+ font_weight=Bold"; 193 tag: "hilight" "+ font_weight=Bold";
@@ -336,7 +195,7 @@ group { name: "elm/gengrid/item/default_style/default";
336 tag: "tab" "\t"; 195 tag: "tab" "\t";
337 } 196 }
338 styles.style { name: "gengrid_style_selected"; 197 styles.style { name: "gengrid_style_selected";
339 base: "font="FN" font_size=10 align=left color=#3399ffff style=glow glow_color=#3399ff18 glow2_color=#3399ff12 text_class=list_item_selected ellipsis=1.0"; 198 base: "font="FN" font_size=10 align=left color=#fff text_class=list_item_selected ellipsis=1.0";
340 tag: "br" "\n"; 199 tag: "br" "\n";
341 tag: "ps" "ps"; 200 tag: "ps" "ps";
342 tag: "hilight" "+ font_weight=Bold"; 201 tag: "hilight" "+ font_weight=Bold";
@@ -344,15 +203,14 @@ group { name: "elm/gengrid/item/default_style/default";
344 tag: "tab" "\t"; 203 tag: "tab" "\t";
345 } 204 }
346 styles.style { name: "gengrid_style_disabled"; 205 styles.style { name: "gengrid_style_disabled";
347 base: "font="FN" font_size=10 align=left color=#151515 style=shadow,bottom shadow_color=#ffffff19 text_class=list_item ellipsis=1.0"; 206 base: "font="FN" font_size=10 align=left color=#505050 text_class=list_item ellipsis=1.0";
348 tag: "br" "\n"; 207 tag: "br" "\n";
349 tag: "ps" "ps"; 208 tag: "ps" "ps";
350 tag: "hilight" "+ font_weight=Bold"; 209 tag: "hilight" "+ font_weight=Bold";
351 tag: "b" "+ font_weight=Bold"; 210 tag: "b" "+ font_weight=Bold";
352 tag: "tab" "\t"; 211 tag: "tab" "\t";
353 } 212 }
354 213
355 IMGP()
356 parts { 214 parts {
357 BASEP() 215 BASEP()
358 216
@@ -362,11 +220,11 @@ group { name: "elm/gengrid/item/default_style/default";
362 description { state: "default" 0.0; 220 description { state: "default" 0.0;
363 fixed: 0 1; 221 fixed: 0 1;
364 rel1.relative: 0.0 1.0; 222 rel1.relative: 0.0 1.0;
365 rel1.offset: 5 -5; 223 rel1.offset: 4 -5;
366 rel2.relative: 1.0 1.0; 224 rel2.relative: 1.0 1.0;
367 rel2.offset: -5 -5; 225 rel2.offset: -5 -5;
368 color_class: "grid_item";
369 align: 0.5 1.0; 226 align: 0.5 1.0;
227 offscale;
370 text { 228 text {
371 min: 0 1; 229 min: 0 1;
372 align: 0.5 1.0; 230 align: 0.5 1.0;
@@ -376,97 +234,40 @@ group { name: "elm/gengrid/item/default_style/default";
376 } 234 }
377 description { state: "selected" 0.0; 235 description { state: "selected" 0.0;
378 inherit: "default" 0.0; 236 inherit: "default" 0.0;
379 visible: 0; 237 text.style: "gengrid_style_selected";
380 }
381 description { state: "disabled" 0.0;
382 inherit: "default" 0.0;
383 visible: 0;
384 }
385 }
386 part { name: "label2"; type: TEXTBLOCK; mouse_events: 0;
387 scale: 1;
388 description { state: "default" 0.0;
389 rel1.to: "elm.text";
390 rel2.to: "elm.text";
391 color_class: "grid_item_disabled";
392 text {
393 text_source: "elm.text";
394 align: 0.5 1.0;
395 text_class: "grid_item";
396 style: "gengrid_style_disabled";
397 }
398 visible: 0;
399 }
400 description { state: "selected" 0.0;
401 inherit: "default" 0.0;
402 visible: 0;
403 } 238 }
404 description { state: "disabled" 0.0; 239 description { state: "disabled" 0.0;
405 inherit: "default" 0.0; 240 inherit: "default" 0.0;
406 visible: 1; 241 text.style: "gengrid_style_disabled";
407 } 242 }
408 } 243 }
409 part { name: "label3"; type: TEXTBLOCK; mouse_events: 0; 244 program { signal: "elm,state,selected"; source: "elm";
410 scale: 1;
411 description { state: "default" 0.0;
412 rel1.to: "elm.text";
413 rel2.to: "elm.text";
414 color_class: "grid_item_selected";
415 text {
416 text_source: "elm.text";
417 align: 0.5 1.0;
418 text_class: "grid_item";
419 style: "gengrid_style_selected";
420 }
421 visible: 0;
422 }
423 description { state: "selected" 0.0;
424 inherit: "default" 0.0;
425 visible: 1;
426 }
427 description { state: "disabled" 0.0;
428 inherit: "default" 0.0;
429 visible: 0;
430 }
431 }
432 program {
433 signal: "elm,state,selected"; source: "elm";
434 action: STATE_SET "selected" 0.0; 245 action: STATE_SET "selected" 0.0;
435 target: "elm.text"; 246 target: "elm.text";
436 target: "label2";
437 target: "label3";
438 } 247 }
439 program { 248 program { signal: "elm,state,unselected"; source: "elm";
440 signal: "elm,state,unselected"; source: "elm";
441 action: STATE_SET "default" 0.0; 249 action: STATE_SET "default" 0.0;
442 target: "elm.text"; 250 target: "elm.text";
443 target: "label2";
444 target: "label3";
445 } 251 }
446 program { 252 program { signal: "elm,state,disabled"; source: "elm";
447 signal: "elm,state,disabled"; source: "elm";
448 action: STATE_SET "disabled" 0.0; 253 action: STATE_SET "disabled" 0.0;
449 target: "elm.text"; 254 target: "elm.text";
450 target: "label2";
451 target: "label3";
452 target: "icon_area"; 255 target: "icon_area";
453 } 256 }
454 program { 257 program { signal: "elm,state,enabled"; source: "elm";
455 signal: "elm,state,enabled"; source: "elm";
456 action: STATE_SET "default" 0.0; 258 action: STATE_SET "default" 0.0;
457 target: "elm.text"; 259 target: "elm.text";
458 target: "label2";
459 target: "label3";
460 target: "icon_area"; 260 target: "icon_area";
461 } 261 }
462 //##// 262 //##//
463 part { name: "icon_area"; type: RECT; 263 part { name: "icon_area"; type: RECT;
264 scale: 1;
464 description { state: "default" 0.0; 265 description { state: "default" 0.0;
465 fixed: 1 0; 266 rel1.offset: 4 4;
466 rel1.offset: 2 2;
467 rel2.to_y: "elm.swallow.pad"; 267 rel2.to_y: "elm.swallow.pad";
468 rel2.relative: 1.0 0.0; 268 rel2.relative: 1.0 0.0;
469 rel2.offset: -3 -3; 269 rel2.offset: -5 -5;
270 offscale;
470 } 271 }
471 description { state: "disabled" 0.0; 272 description { state: "disabled" 0.0;
472 inherit: "default" 0.0; 273 inherit: "default" 0.0;
@@ -474,38 +275,53 @@ group { name: "elm/gengrid/item/default_style/default";
474 } 275 }
475 } 276 }
476 part { name: "elm.swallow.pad"; type: SWALLOW; 277 part { name: "elm.swallow.pad"; type: SWALLOW;
278 scale: 1;
477 description { state: "default" 0.0; 279 description { state: "default" 0.0;
478 fixed: 0 1; 280 fixed: 0 1;
479 align: 0.0 1.0; 281 align: 0.0 1.0;
480 rel1.to_y: "elm.text"; 282 rel1.to_y: "elm.text";
283 rel2.offset: 0 0;
481 rel2.to_y: "elm.text"; 284 rel2.to_y: "elm.text";
482 rel2.relative: 1.0 0.0; 285 rel2.relative: 1.0 0.0;
286 rel2.offset: -1 0;
287 offscale;
483 } 288 }
484 } 289 }
485 part { name: "elm.swallow.icon"; type: SWALLOW; 290 part { name: "elm.swallow.icon"; type: SWALLOW;
486 clip_to: "icon_area"; 291 clip_to: "icon_area";
487 description { state: "default" 0.0; 292 description { state: "default" 0.0;
488 rel1.to: "icon_area"; 293 rel.to: "icon_area";
489 rel2.to: "icon_area";
490 } 294 }
491 } 295 }
492 part { name: "elm.swallow.end"; type: SWALLOW; 296 part { name: "elm.swallow.end"; type: SWALLOW;
297 scale: 1;
493 clip_to: "icon_area"; 298 clip_to: "icon_area";
494 description { state: "default" 0.0; 299 description { state: "default" 0.0;
495 fixed: 1 1; 300 min: ICMIN ICMIN;
496 align: 1.0 0.0; 301 align: 1.0 0.0;
302 rel.to: "icon_area";
497 rel1.relative: 1.0 0.0; 303 rel1.relative: 1.0 0.0;
498 rel1.offset: -3 2; 304 rel1.offset: -5 4;
499 rel2.relative: 1.0 0.0; 305 rel2.relative: 1.0 0.0;
500 rel2.offset: -3 2; 306 rel2.offset: -5 4;
307 offscale;
501 } 308 }
502 } 309 }
503 //##// 310 //##//
504 311
505 TOPP() 312 TOPP()
506 } 313 }
507} 314}
508 315
316#define IC(_NAME, _ICON) \
317 set { name: _NAME; \
318 image {image: _ICON"-060.png" COMP; size: 31 31 60000 60000; } \
319 image {image: _ICON"-030.png" COMP; size: 16 16 30 30; } \
320 image {image: _ICON"-015.png" COMP; size: 0 0 15 15; } \
321 }
322IC("ic-arrow-u", "arrow-u")
323#undef IC
324
509group { name: "elm/gengrid/item/up/default"; 325group { name: "elm/gengrid/item/up/default";
510 inherit: "elm/gengrid/item/default/default"; 326 inherit: "elm/gengrid/item/default/default";
511 images.image: "icon_arrow_up.png" COMP; 327 images.image: "icon_arrow_up.png" COMP;
@@ -517,12 +333,38 @@ group { name: "elm/gengrid/item/up/default";
517 } 333 }
518 part { name: "up"; 334 part { name: "up";
519 insert_after: "elm.swallow.pad"; 335 insert_after: "elm.swallow.pad";
336 scale: 1;
520 description { state: "default" 0.0; 337 description { state: "default" 0.0;
338 min: 30 30; max: 30 30;
521 aspect: 1.0 1.0; aspect_preference: BOTH; 339 aspect: 1.0 1.0; aspect_preference: BOTH;
522 rel1.to: "icon_area"; 340 rel.to: "icon_area";
523 rel2.to: "icon_area"; 341 image.normal: "ic-arrow-u";
524 image.normal: "icon_arrow_up.png"; 342 color: 160 160 160 255;
525 } 343 }
344 description { state: "selected" 0.0;
345 inherit: "default" 0.0;
346 color: 255 255 255 255;
347 }
348 description { state: "disabled" 0.0;
349 inherit: "default" 0.0;
350 color: 80 80 80 255;
351 }
352 }
353 program { signal: "elm,state,selected"; source: "elm";
354 action: STATE_SET "selected" 0.0;
355 target: "up";
356 }
357 program { signal: "elm,state,unselected"; source: "elm";
358 action: STATE_SET "default" 0.0;
359 target: "up";
360 }
361 program { signal: "elm,state,disabled"; source: "elm";
362 action: STATE_SET "disabled" 0.0;
363 target: "up";
364 }
365 program { signal: "elm,state,enabled"; source: "elm";
366 action: STATE_SET "default" 0.0;
367 target: "up";
526 } 368 }
527 } 369 }
528} 370}
@@ -533,26 +375,21 @@ group { name: "elm/gengrid/item/album-preview/default";
533 data.item: "texts" "elm.text"; 375 data.item: "texts" "elm.text";
534 data.item: "contents" "elm.swallow.icon.1 elm.swallow.icon.2 elm.swallow.icon.3 elm.swallow.icon.4"; 376 data.item: "contents" "elm.swallow.icon.1 elm.swallow.icon.2 elm.swallow.icon.3 elm.swallow.icon.4";
535 data.item: "states" "have_files"; 377 data.item: "states" "have_files";
536 378
537 IMGP()
538 images.image: "icon_folder.png" COMP;
539
540 parts { 379 parts {
541 BASEP() 380 BASEP()
542 381
543 //##// 382 //##//
544 part { name: "elm.text"; type: TEXT; mouse_events: 0; 383 part { name: "elm.text"; type: TEXT; mouse_events: 0;
545 effect: SHADOW BOTTOM;
546 scale: 1; 384 scale: 1;
547 description { state: "default" 0.0; 385 description { state: "default" 0.0;
548 fixed: 0 1; 386 fixed: 0 1;
549 rel1.relative: 0.0 1.0; 387 rel1.relative: 0.0 1.0;
550 rel1.offset: 5 -5; 388 rel1.offset: 4 -5;
551 rel2.relative: 1.0 1.0;
552 rel2.offset: -5 -5; 389 rel2.offset: -5 -5;
553 color: FN_COL_DEFAULT; 390 color: 160 160 160 255;
554 color_class: "grid_item";
555 align: 0.5 1.0; 391 align: 0.5 1.0;
392 offscale;
556 text { font: FN; size: 10; 393 text { font: FN; size: 10;
557 min: 0 1; 394 min: 0 1;
558 align: 0.5 1.0; 395 align: 0.5 1.0;
@@ -561,101 +398,40 @@ group { name: "elm/gengrid/item/album-preview/default";
561 } 398 }
562 description { state: "selected" 0.0; 399 description { state: "selected" 0.0;
563 inherit: "default" 0.0; 400 inherit: "default" 0.0;
564 visible: 0; 401 color: 255 255 255 255;
565 }
566 description { state: "disabled" 0.0;
567 inherit: "default" 0.0;
568 visible: 0;
569 }
570 }
571 part { name: "label2"; type: TEXT; mouse_events: 0;
572 effect: SHADOW BOTTOM;
573 scale: 1;
574 description { state: "default" 0.0;
575 rel1.to: "elm.text";
576 rel2.to: "elm.text";
577 color: FN_COL_DISABLE;
578 color_class: "grid_item_disabled";
579 text { font: FN; size: 10;
580 text_source: "elm.text";
581 align: 0.5 1.0;
582 text_class: "grid_item";
583 }
584 visible: 0;
585 }
586 description { state: "selected" 0.0;
587 inherit: "default" 0.0;
588 visible: 0;
589 } 402 }
590 description { state: "disabled" 0.0; 403 description { state: "disabled" 0.0;
591 inherit: "default" 0.0; 404 inherit: "default" 0.0;
592 visible: 1; 405 color: 80 80 80 255;
593 } 406 }
594 } 407 }
595 part { name: "label3"; type: TEXT; mouse_events: 0; 408 program { signal: "elm,state,selected"; source: "elm";
596 effect: GLOW;
597 scale: 1;
598 description { state: "default" 0.0;
599 rel1.offset: -2 -2;
600 rel1.to: "elm.text";
601 rel2.offset: 1 0;
602 rel2.to: "elm.text";
603 color: FN_COL_HIGHLIGHT;
604 color_class: "grid_item_selected";
605 text { font: FN; size: 10;
606 text_source: "elm.text";
607 align: 0.5 1.0;
608 text_class: "grid_item";
609 }
610 visible: 0;
611 }
612 description { state: "selected" 0.0;
613 inherit: "default" 0.0;
614 visible: 1;
615 }
616 description { state: "disabled" 0.0;
617 inherit: "default" 0.0;
618 visible: 0;
619 }
620 }
621 program {
622 signal: "elm,state,selected"; source: "elm";
623 action: STATE_SET "selected" 0.0; 409 action: STATE_SET "selected" 0.0;
624 target: "elm.text"; 410 target: "elm.text";
625 target: "label2";
626 target: "label3";
627 } 411 }
628 program { 412 program { signal: "elm,state,unselected"; source: "elm";
629 signal: "elm,state,unselected"; source: "elm";
630 action: STATE_SET "default" 0.0; 413 action: STATE_SET "default" 0.0;
631 target: "elm.text"; 414 target: "elm.text";
632 target: "label2";
633 target: "label3";
634 } 415 }
635 program { 416 program { signal: "elm,state,disabled"; source: "elm";
636 signal: "elm,state,disabled"; source: "elm";
637 action: STATE_SET "disabled" 0.0; 417 action: STATE_SET "disabled" 0.0;
638 target: "elm.text"; 418 target: "elm.text";
639 target: "label2";
640 target: "label3";
641 target: "icon_area"; 419 target: "icon_area";
642 } 420 }
643 program { 421 program { signal: "elm,state,enabled"; source: "elm";
644 signal: "elm,state,enabled"; source: "elm";
645 action: STATE_SET "default" 0.0; 422 action: STATE_SET "default" 0.0;
646 target: "elm.text"; 423 target: "elm.text";
647 target: "label2";
648 target: "label3";
649 target: "icon_area"; 424 target: "icon_area";
650 } 425 }
651 //##// 426 //##//
652 part { name: "icon_area"; type: RECT; 427 part { name: "icon_area"; type: RECT;
428 scale: 1;
653 description { state: "default" 0.0; 429 description { state: "default" 0.0;
654 fixed: 1 0; 430 rel1.offset: 4 4;
655 rel1.offset: 2 2;
656 rel2.to_y: "elm.swallow.pad"; 431 rel2.to_y: "elm.swallow.pad";
657 rel2.relative: 1.0 0.0; 432 rel2.relative: 1.0 0.0;
658 rel2.offset: -3 -3; 433 rel2.offset: -5 -5;
434 offscale;
659 visible: 0; 435 visible: 0;
660 } 436 }
661 description { state: "visible" 0.0; 437 description { state: "visible" 0.0;
@@ -665,18 +441,30 @@ group { name: "elm/gengrid/item/album-preview/default";
665 description { state: "disabled" 0.0; 441 description { state: "disabled" 0.0;
666 inherit: "default" 0.0; 442 inherit: "default" 0.0;
667 color: 255 255 255 64; 443 color: 255 255 255 64;
444 visible: 1;
668 } 445 }
669 } 446 }
670 program { 447 program { signal: "elm,state,have_files,active"; source: "elm";
671 signal: "elm,state,have_files,active"; source: "elm";
672 action: STATE_SET "visible" 0.0; 448 action: STATE_SET "visible" 0.0;
673 target: "icon_area"; 449 target: "icon_area";
674 } 450 }
451 part { name: "elm.swallow.pad"; type: SWALLOW;
452 scale: 1;
453 description { state: "default" 0.0;
454 fixed: 0 1;
455 align: 0.0 1.0;
456 rel1.to_y: "elm.text";
457 rel2.offset: 0 0;
458 rel2.to_y: "elm.text";
459 rel2.relative: 1.0 0.0;
460 rel2.offset: -1 0;
461 offscale;
462 }
463 }
675 part { name: "icon_area2"; type: SPACER; 464 part { name: "icon_area2"; type: SPACER;
676 description { state: "default" 0.0; 465 description { state: "default" 0.0;
677 rel1.to: "icon_area"; 466 rel.to: "icon_area";
678 rel1.relative: 0.3 0.3; 467 rel1.relative: 0.3 0.3;
679 rel2.to: "icon_area";
680 rel2.relative: 0.7 0.7; 468 rel2.relative: 0.7 0.7;
681 } 469 }
682 } 470 }
@@ -684,18 +472,8 @@ group { name: "elm/gengrid/item/album-preview/default";
684 insert_after: "elm.swallow.pad"; 472 insert_after: "elm.swallow.pad";
685 description { state: "default" 0.0; 473 description { state: "default" 0.0;
686 aspect: 1.0 1.0; aspect_preference: BOTH; 474 aspect: 1.0 1.0; aspect_preference: BOTH;
687 rel1.to: "icon_area"; 475 rel.to: "icon_area";
688 rel2.to: "icon_area"; 476 image.normal: "efm_folder_icon";
689 image.normal: "icon_folder.png";
690 }
691 }
692 part { name: "elm.swallow.pad"; type: SWALLOW;
693 description { state: "default" 0.0;
694 fixed: 0 1;
695 align: 0.0 1.0;
696 rel1.to_y: "elm.text";
697 rel2.to_y: "elm.text";
698 rel2.relative: 1.0 0.0;
699 } 477 }
700 } 478 }
701 part { name: "elm.swallow.icon.1"; type: SWALLOW; mouse_events: 0; 479 part { name: "elm.swallow.icon.1"; type: SWALLOW; mouse_events: 0;
@@ -734,8 +512,28 @@ group { name: "elm/gengrid/item/album-preview/default";
734 rel2.relative: 1.0 1.0; 512 rel2.relative: 1.0 1.0;
735 } 513 }
736 } 514 }
515 part { name: "elm.swallow.icon"; type: SWALLOW;
516 clip_to: "icon_area";
517 description { state: "default" 0.0;
518 rel.to: "icon_area";
519 }
520 }
521 part { name: "elm.swallow.end"; type: SWALLOW;
522 scale: 1;
523 clip_to: "icon_area";
524 description { state: "default" 0.0;
525 min: ICMIN ICMIN;
526 align: 1.0 0.0;
527 rel.to: "icon_area";
528 rel1.relative: 1.0 0.0;
529 rel1.offset: -5 4;
530 rel2.relative: 1.0 0.0;
531 rel2.offset: -5 4;
532 offscale;
533 }
534 }
737 //##// 535 //##//
738 536
739 TOPP() 537 TOPP()
740 } 538 }
741} 539}
@@ -745,97 +543,88 @@ group { name: "elm/gengrid/item/thumb/default";
745 data.item: "focusraise" "on"; 543 data.item: "focusraise" "on";
746 data.item: "texts" "elm.text"; 544 data.item: "texts" "elm.text";
747 data.item: "contents" "elm.swallow.icon elm.swallow.end"; 545 data.item: "contents" "elm.swallow.icon elm.swallow.end";
748
749 images.image: "win_shadow.png" COMP;
750 images.image: "win_glow.png" COMP;
751 parts { 546 parts {
752 547 part { name: "base"; type: RECT;
753 part { name: "shadow"; mouse_events: 0; 548 scale: 1;
754 description { state: "default" 0.0;
755 image.normal: "win_shadow.png";
756 image.border: 14 14 14 14;
757 image.middle: 0;
758 rel1.to: "base";
759 rel1.offset: -7 -3;
760 rel2.to: "base";
761 rel2.offset: 6 11;
762 fill.smooth: 0;
763 }
764 }
765 part { name: "glow"; mouse_events: 0;
766 description { state: "default" 0.0; 549 description { state: "default" 0.0;
767 image.normal: "win_glow.png"; 550 rel.to: "icon_area";
768 image.border: 9 9 9 9; 551 rel1.offset: -4 -4;
769 image.middle: 0;
770 rel1.offset: -5 -5;
771 rel1.to: "base";
772 rel2.offset: 4 4; 552 rel2.offset: 4 4;
773 rel2.to: "base"; 553 rel2.to: "icon_area";
774 fill.smooth: 0; 554 color: 255 255 255 255;
775 color: 255 255 255 0; 555 offscale;
776 visible: 0;
777 } 556 }
778 description { state: "selected" 0.0; 557 description { state: "selected" 0.0;
779 inherit: "default" 0.0; 558 inherit: "default" 0.0;
780 color: 255 255 255 255; 559 color: 51 153 255 255;
781 visible: 1; 560 }
561 description { state: "disabled" 0.0;
562 inherit: "default" 0.0;
563 visible: 0;
782 } 564 }
783 } 565 }
784 part { name: "base"; type: RECT; 566 part { name: "base2"; type: RECT;
567 scale: 1;
785 description { state: "default" 0.0; 568 description { state: "default" 0.0;
786 rel1.offset: -4 -4; 569 rel1.relative: 0.0 1.0;
787 rel1.to: "icon_area"; 570 color: 51 153 255 255;
788 rel2.offset: 3 3; 571 offscale;
789 rel2.to: "icon_area";
790 color: 255 255 255 255;
791 } 572 }
792 description { state: "selected" 0.0; 573 description { state: "selected" 0.0;
793 inherit: "default" 0.0; 574 inherit: "default" 0.0;
794 color: 48 48 48 255; 575 rel1.to_y: "base";
795 } 576 }
796 description { state: "disabled" 0.0; 577 description { state: "disabled" 0.0;
797 inherit: "default" 0.0; 578 inherit: "default" 0.0;
798 color: 64 64 64 255; 579 visible: 0;
799 } 580 }
800 } 581 }
801 program { 582 program { signal: "elm,state,selected"; source: "elm";
802 signal: "elm,state,selected"; source: "elm";
803 action: STATE_SET "selected" 0.0; 583 action: STATE_SET "selected" 0.0;
804 target: "base"; 584 target: "base";
805 target: "glow";
806 } 585 }
807 program { 586 program { signal: "elm,state,unselected"; source: "elm";
808 signal: "elm,state,unselected"; source: "elm";
809 action: STATE_SET "default" 0.0; 587 action: STATE_SET "default" 0.0;
810 target: "base"; 588 target: "base";
811 target: "glow";
812 } 589 }
813 program { 590 program { signal: "elm,state,disabled"; source: "elm";
814 signal: "elm,state,disabled"; source: "elm";
815 action: STATE_SET "disabled" 0.0; 591 action: STATE_SET "disabled" 0.0;
816 target: "base"; 592 target: "base";
817 target: "icon_area";
818 } 593 }
819 program { 594 program { signal: "elm,state,enabled"; source: "elm";
820 signal: "elm,state,enabled"; source: "elm";
821 action: STATE_SET "default" 0.0; 595 action: STATE_SET "default" 0.0;
822 target: "base"; 596 target: "base";
823 target: "icon_area";
824 } 597 }
825 598 program { signal: "elm,state,selected"; source: "elm";
599 action: STATE_SET "selected" 0.0;
600 transition: DECELERATE 0.2;
601 target: "base2";
602 }
603 program { signal: "elm,state,unselected"; source: "elm";
604 action: STATE_SET "default" 0.0;
605 transition: DECELERATE 0.2;
606 target: "base2";
607 }
608 program { signal: "elm,state,disabled"; source: "elm";
609 action: STATE_SET "disabled" 0.0;
610 target: "base2";
611 }
612 program { signal: "elm,state,enabled"; source: "elm";
613 action: STATE_SET "default" 0.0;
614 target: "base2";
615 }
616
826 //##// 617 //##//
827 part { name: "elm.text"; type: TEXT; mouse_events: 0; 618 part { name: "elm.text"; type: TEXT; mouse_events: 0;
828 effect: SHADOW BOTTOM;
829 scale: 1; 619 scale: 1;
830 description { state: "default" 0.0; 620 description { state: "default" 0.0;
831 fixed: 0 1; 621 fixed: 0 1;
832 rel1.relative: 0.0 1.0; 622 rel1.relative: 0.0 1.0;
833 rel1.offset: 5 -5; 623 rel1.offset: 4 -5;
834 rel2.relative: 1.0 1.0;
835 rel2.offset: -5 -5; 624 rel2.offset: -5 -5;
836 color: FN_COL_DEFAULT; 625 color: 160 160 160 255;
837 color_class: "grid_item";
838 align: 0.5 1.0; 626 align: 0.5 1.0;
627 offscale;
839 text { font: FN; size: 10; 628 text { font: FN; size: 10;
840 min: 0 1; 629 min: 0 1;
841 align: 0.5 1.0; 630 align: 0.5 1.0;
@@ -844,100 +633,40 @@ group { name: "elm/gengrid/item/thumb/default";
844 } 633 }
845 description { state: "selected" 0.0; 634 description { state: "selected" 0.0;
846 inherit: "default" 0.0; 635 inherit: "default" 0.0;
847 visible: 0; 636 color: 255 255 255 255;
848 }
849 description { state: "disabled" 0.0;
850 inherit: "default" 0.0;
851 visible: 0;
852 }
853 }
854 part { name: "label2"; type: TEXT; mouse_events: 0;
855 effect: SHADOW BOTTOM;
856 scale: 1;
857 description { state: "default" 0.0;
858 rel1.to: "elm.text";
859 rel2.to: "elm.text";
860 color: FN_COL_DISABLE;
861 color_class: "grid_item_disabled";
862 text { font: FN; size: 10;
863 text_source: "elm.text";
864 align: 0.5 1.0;
865 text_class: "grid_item";
866 }
867 visible: 0;
868 }
869 description { state: "selected" 0.0;
870 inherit: "default" 0.0;
871 visible: 0;
872 }
873 description { state: "disabled" 0.0;
874 inherit: "default" 0.0;
875 visible: 1;
876 }
877 }
878 part { name: "label3"; type: TEXT; mouse_events: 0;
879 effect: GLOW;
880 scale: 1;
881 description { state: "default" 0.0;
882 rel1.offset: -2 -2;
883 rel1.to: "elm.text";
884 rel2.offset: 1 0;
885 rel2.to: "elm.text";
886 color: FN_COL_HIGHLIGHT;
887 color_class: "grid_item_selected";
888 text { font: FN; size: 10;
889 text_source: "elm.text";
890 align: 0.5 1.0;
891 text_class: "grid_item";
892 }
893 visible: 0;
894 }
895 description { state: "selected" 0.0;
896 inherit: "default" 0.0;
897 visible: 1;
898 } 637 }
899 description { state: "disabled" 0.0; 638 description { state: "disabled" 0.0;
900 inherit: "default" 0.0; 639 inherit: "default" 0.0;
901 visible: 0; 640 color: 80 80 80 255;
902 } 641 }
903 } 642 }
904 program { 643 program { signal: "elm,state,selected"; source: "elm";
905 signal: "elm,state,selected"; source: "elm";
906 action: STATE_SET "selected" 0.0; 644 action: STATE_SET "selected" 0.0;
907 target: "elm.text"; 645 target: "elm.text";
908 target: "label2";
909 target: "label3";
910 } 646 }
911 program { 647 program { signal: "elm,state,unselected"; source: "elm";
912 signal: "elm,state,unselected"; source: "elm";
913 action: STATE_SET "default" 0.0; 648 action: STATE_SET "default" 0.0;
914 target: "elm.text"; 649 target: "elm.text";
915 target: "label2";
916 target: "label3";
917 } 650 }
918 program { 651 program { signal: "elm,state,disabled"; source: "elm";
919 signal: "elm,state,disabled"; source: "elm";
920 action: STATE_SET "disabled" 0.0; 652 action: STATE_SET "disabled" 0.0;
921 target: "elm.text"; 653 target: "elm.text";
922 target: "label2"; 654 target: "icon_area";
923 target: "label3";
924 } 655 }
925 program { 656 program { signal: "elm,state,enabled"; source: "elm";
926 signal: "elm,state,enabled"; source: "elm";
927 action: STATE_SET "default" 0.0; 657 action: STATE_SET "default" 0.0;
928 target: "elm.text"; 658 target: "elm.text";
929 target: "label2"; 659 target: "icon_area";
930 target: "label3";
931 } 660 }
932 //##// 661 //##//
933 part { name: "icon_area"; type: RECT; 662 part { name: "icon_area"; type: RECT;
663 scale: 1;
934 description { state: "default" 0.0; 664 description { state: "default" 0.0;
935 fixed: 1 0; 665 rel1.offset: 8 8;
936 aspect: 1.0 1.0; aspect_preference: BOTH;
937 rel1.offset: 12 12;
938 rel2.to_y: "elm.swallow.pad"; 666 rel2.to_y: "elm.swallow.pad";
939 rel2.relative: 1.0 0.0; 667 rel2.relative: 1.0 0.0;
940 rel2.offset: -13 -13; 668 rel2.offset: -9 -9;
669 offscale;
941 } 670 }
942 description { state: "disabled" 0.0; 671 description { state: "disabled" 0.0;
943 inherit: "default" 0.0; 672 inherit: "default" 0.0;
@@ -945,34 +674,39 @@ group { name: "elm/gengrid/item/thumb/default";
945 } 674 }
946 } 675 }
947 part { name: "elm.swallow.pad"; type: SWALLOW; 676 part { name: "elm.swallow.pad"; type: SWALLOW;
677 scale: 1;
948 description { state: "default" 0.0; 678 description { state: "default" 0.0;
949 fixed: 0 1; 679 fixed: 0 1;
950 align: 0.0 1.0; 680 align: 0.0 1.0;
951 rel1.to_y: "elm.text"; 681 rel1.to_y: "elm.text";
682 rel2.offset: 0 0;
952 rel2.to_y: "elm.text"; 683 rel2.to_y: "elm.text";
953 rel2.relative: 1.0 0.0; 684 rel2.relative: 1.0 0.0;
685 rel2.offset: -1 0;
686 offscale;
954 } 687 }
955 } 688 }
956 part { name: "elm.swallow.icon"; type: SWALLOW; 689 part { name: "elm.swallow.icon"; type: SWALLOW;
957 clip_to: "icon_area"; 690 clip_to: "icon_area";
958 description { state: "default" 0.0; 691 description { state: "default" 0.0;
959 rel1.to: "icon_area"; 692 rel.to: "icon_area";
960 rel2.to: "icon_area";
961 } 693 }
962 } 694 }
963 part { name: "elm.swallow.end"; type: SWALLOW; 695 part { name: "elm.swallow.end"; type: SWALLOW;
696 scale: 1;
964 clip_to: "icon_area"; 697 clip_to: "icon_area";
965 description { state: "default" 0.0; 698 description { state: "default" 0.0;
966 fixed: 1 1; 699 min: ICMIN ICMIN;
967 align: 1.0 0.0; 700 align: 1.0 0.0;
701 rel.to: "icon_area";
968 rel1.relative: 1.0 0.0; 702 rel1.relative: 1.0 0.0;
969 rel1.offset: -3 2; 703 rel1.offset: -5 4;
970 rel2.relative: 1.0 0.0; 704 rel2.relative: 1.0 0.0;
971 rel2.offset: -3 2; 705 rel2.offset: -5 4;
706 offscale;
972 } 707 }
973 } 708 }
974 } 709 }
975} 710}
976#undef IMGP
977#undef BASEP 711#undef BASEP
978#undef TOPP 712#undef TOPP
diff --git a/data/elementary/themes/edc/elm/genlist.edc b/data/elementary/themes/edc/elm/genlist.edc
index 15545bfea7..97e7807f05 100644
--- a/data/elementary/themes/edc/elm/genlist.edc
+++ b/data/elementary/themes/edc/elm/genlist.edc
@@ -62,7 +62,6 @@
62 } \ 62 } \
63 } 63 }
64 64
65#define ICMIN 15
66#define TREEPAD (ICMIN+4) 65#define TREEPAD (ICMIN+4)
67 66
68group { "elm/genlist/item/group_index/default"; nomouse; program_source: "elm"; 67group { "elm/genlist/item/group_index/default"; nomouse; program_source: "elm";
@@ -87,6 +86,7 @@ group { "elm/genlist/item/group_index/default"; nomouse; program_source: "elm";
87 rel2.offset: -5 -5; 86 rel2.offset: -5 -5;
88 rel2.relative: 0.0 1.0; 87 rel2.relative: 0.0 1.0;
89 rel2.to_x: "elm.swallow.end"; 88 rel2.to_x: "elm.swallow.end";
89 align: 0.0 0.5;
90 color: 255 255 255 255; 90 color: 255 255 255 255;
91 text { font: FNBD; size: 10; 91 text { font: FNBD; size: 10;
92 min: 1 1; 92 min: 1 1;
diff --git a/data/elementary/themes/edc/elm/photo.edc b/data/elementary/themes/edc/elm/photo.edc
index 66751dc122..dd8cce3098 100644
--- a/data/elementary/themes/edc/elm/photo.edc
+++ b/data/elementary/themes/edc/elm/photo.edc
@@ -1,19 +1,12 @@
1group { name: "elm/photo/base/default"; 1group { name: "elm/photo/base/default";
2 images.image: "win_shadow.png" COMP; 2 images.image: "win_shadow.png" COMP;
3 parts { 3 parts {
4 part { name: "shadow"; mouse_events: 0;
5 scale: 1;
6 description { state: "default" 0.0;
7 rel.to: "base";
8 WIN_SHADOW_SMALL;
9 }
10 }
11 part { name: "base"; type: RECT; 4 part { name: "base"; type: RECT;
12 scale: 1; 5 scale: 1;
13 description { state: "default" 0.0; 6 description { state: "default" 0.0;
14 rel1.offset: 4 4; 7 rel1.offset: 4 4;
15 rel2.offset: -5 -5; 8 rel2.offset: -5 -5;
16 color: 128 128 128 255; 9 color: 255 255 255 255;
17 offscale; 10 offscale;
18 } 11 }
19 } 12 }
diff --git a/data/elementary/themes/edc/elm/radio.edc b/data/elementary/themes/edc/elm/radio.edc
index 4f2d4ab20e..cde26ab0d0 100644
--- a/data/elementary/themes/edc/elm/radio.edc
+++ b/data/elementary/themes/edc/elm/radio.edc
@@ -58,6 +58,7 @@ group { name: "elm/radio/base/default";
58 desc { "visible"; inherit; 58 desc { "visible"; inherit;
59 fixed: 1 0; 59 fixed: 1 0;
60 aspect: 1.0 1.0; 60 aspect: 1.0 1.0;
61 min: ICMIN ICMIN;
61 visible: 1; 62 visible: 1;
62 } 63 }
63 desc { "icononly"; inherit; 64 desc { "icononly"; inherit;
@@ -137,7 +138,7 @@ group { name: "elm/radio/base/default";
137 text { "elm.text"; nomouse; 138 text { "elm.text"; nomouse;
138 scale: 1; 139 scale: 1;
139 desc { "default"; 140 desc { "default";
140 fixed: 1 1; 141 fixed: 0 1;
141 color: 160 160 160 255; 142 color: 160 160 160 255;
142 rel1.offset: 0 4; 143 rel1.offset: 0 4;
143 rel1.relative: 1.0 0.0; 144 rel1.relative: 1.0 0.0;
diff --git a/data/elementary/themes/macros.edc b/data/elementary/themes/macros.edc
index 972ae52ded..7270d716bb 100644
--- a/data/elementary/themes/macros.edc
+++ b/data/elementary/themes/macros.edc
@@ -7,6 +7,8 @@
7#define FIXED_SIZE(_WIDTH, _HEIGHT) \ 7#define FIXED_SIZE(_WIDTH, _HEIGHT) \
8 min: _WIDTH _HEIGHT; max: _WIDTH _HEIGHT; fixed: 1 1; 8 min: _WIDTH _HEIGHT; max: _WIDTH _HEIGHT; fixed: 1 1;
9 9
10#define ICMIN 15
11
10#define SPACER_TEXT "NN"; 12#define SPACER_TEXT "NN";
11 13
12#define BACKGROUND_COMP LOSSY 99 14#define BACKGROUND_COMP LOSSY 99