summaryrefslogtreecommitdiff
path: root/data/elementary/themes
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2020-06-30 21:22:16 +0100
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2020-06-30 21:22:16 +0100
commit87d30cd7fdae5cda844a6be433b5fe03234a77e2 (patch)
treedf31d293d49e74496cede1f7f46eba3ef391bbf7 /data/elementary/themes
parenta17e8a1221658d4cf26d3f2e0297f2335728901d (diff)
TH - scaling and start work on making lots of icons scale better
Diffstat (limited to 'data/elementary/themes')
-rw-r--r--data/elementary/themes/default.edc8
-rw-r--r--data/elementary/themes/edc/border.edc33
-rw-r--r--data/elementary/themes/edc/comp.edc3
-rw-r--r--data/elementary/themes/edc/elm/border.edc202
-rw-r--r--data/elementary/themes/edc/elm/button.edc36
-rw-r--r--data/elementary/themes/edc/elm/entry.edc73
-rw-r--r--data/elementary/themes/edc/elm/gengrid.edc2
-rw-r--r--data/elementary/themes/edc/elm/panel.edc30
-rw-r--r--data/elementary/themes/edc/elm/pointer.edc65
-rw-r--r--data/elementary/themes/edc/elm/toolbar.edc22
-rw-r--r--data/elementary/themes/edc/fileman.edc28
-rw-r--r--data/elementary/themes/edc/icons.edc125
-rw-r--r--data/elementary/themes/edc/start.edc31
-rw-r--r--data/elementary/themes/ic.edc831
-rw-r--r--data/elementary/themes/img/close.svg69
-rw-r--r--data/elementary/themes/img/ic/arrow-d-015.pngbin0 -> 2668 bytes
-rw-r--r--data/elementary/themes/img/ic/arrow-d-030.pngbin0 -> 2958 bytes
-rw-r--r--data/elementary/themes/img/ic/arrow-d-060.pngbin0 -> 3391 bytes
-rw-r--r--data/elementary/themes/img/ic/arrow-l-015.pngbin0 -> 2668 bytes
-rw-r--r--data/elementary/themes/img/ic/arrow-l-030.pngbin0 -> 2948 bytes
-rw-r--r--data/elementary/themes/img/ic/arrow-l-060.pngbin0 -> 3349 bytes
-rw-r--r--data/elementary/themes/img/ic/arrow-r-015.pngbin0 -> 2682 bytes
-rw-r--r--data/elementary/themes/img/ic/arrow-r-030.pngbin0 -> 2942 bytes
-rw-r--r--data/elementary/themes/img/ic/arrow-r-060.pngbin0 -> 3343 bytes
-rw-r--r--data/elementary/themes/img/ic/arrow-u-015.pngbin0 -> 2677 bytes
-rw-r--r--data/elementary/themes/img/ic/arrow-u-030.pngbin0 -> 2933 bytes
-rw-r--r--data/elementary/themes/img/ic/arrow-u-060.pngbin0 -> 3375 bytes
-rw-r--r--data/elementary/themes/img/ic/close-015.pngbin0 -> 124 bytes
-rw-r--r--data/elementary/themes/img/ic/close-030.pngbin0 -> 291 bytes
-rw-r--r--data/elementary/themes/img/ic/close-060.pngbin0 -> 422 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-computer-040.pngbin0 -> 412 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-computer-080.pngbin0 -> 552 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-computer-160.pngbin0 -> 831 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-desktop-040.pngbin0 -> 775 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-desktop-080.pngbin0 -> 1537 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-desktop-160.pngbin0 -> 3094 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-drive-cd-040.pngbin0 -> 1422 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-drive-cd-080.pngbin0 -> 3031 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-drive-cd-160.pngbin0 -> 6303 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-drive-flash-040.pngbin0 -> 417 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-drive-flash-080.pngbin0 -> 659 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-drive-flash-160.pngbin0 -> 1087 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-drive-hdd-040.pngbin0 -> 1358 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-drive-hdd-080.pngbin0 -> 2914 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-drive-hdd-160.pngbin0 -> 5760 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-drive-usb-media-040.pngbin0 -> 456 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-drive-usb-media-080.pngbin0 -> 813 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-drive-usb-media-160.pngbin0 -> 1607 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-favorite-040.pngbin0 -> 1190 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-favorite-080.pngbin0 -> 2374 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-favorite-160.pngbin0 -> 4778 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-folder-040.pngbin0 -> 420 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-folder-080.pngbin0 -> 728 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-folder-160.pngbin0 -> 1283 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-home-040.pngbin0 -> 314 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-home-080.pngbin0 -> 507 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-home-160.pngbin0 -> 895 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-temp-040.pngbin0 -> 858 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-temp-080.pngbin0 -> 1785 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-temp-160.pngbin0 -> 3509 bytes
-rw-r--r--data/elementary/themes/img/ic/heart-015.pngbin0 -> 241 bytes
-rw-r--r--data/elementary/themes/img/ic/heart-030.pngbin0 -> 343 bytes
-rw-r--r--data/elementary/themes/img/ic/heart-060.pngbin0 -> 627 bytes
-rw-r--r--data/elementary/themes/img/ic/reload-015.pngbin0 -> 287 bytes
-rw-r--r--data/elementary/themes/img/ic/reload-030.pngbin0 -> 402 bytes
-rw-r--r--data/elementary/themes/img/ic/reload-060.pngbin0 -> 803 bytes
-rw-r--r--data/elementary/themes/img/ic/system-shutdown-040.pngbin0 -> 695 bytes
-rw-r--r--data/elementary/themes/img/ic/system-shutdown-080.pngbin0 -> 1447 bytes
-rw-r--r--data/elementary/themes/img/ic/system-shutdown-160.pngbin0 -> 2991 bytes
-rw-r--r--data/elementary/themes/img/ic/system-suspend-040.pngbin0 -> 765 bytes
-rw-r--r--data/elementary/themes/img/ic/system-suspend-080.pngbin0 -> 1518 bytes
-rw-r--r--data/elementary/themes/img/ic/system-suspend-160.pngbin0 -> 3122 bytes
-rw-r--r--data/elementary/themes/img/ic/unknown-040.pngbin0 -> 383 bytes
-rw-r--r--data/elementary/themes/img/ic/unknown-080.pngbin0 -> 605 bytes
-rw-r--r--data/elementary/themes/img/ic/unknown-160.pngbin0 -> 1084 bytes
-rw-r--r--data/elementary/themes/img/system-shutdown.svg80
-rw-r--r--data/elementary/themes/img/system-suspend.svg78
-rw-r--r--data/elementary/themes/macros.edc2
78 files changed, 1287 insertions, 431 deletions
diff --git a/data/elementary/themes/default.edc b/data/elementary/themes/default.edc
index 5a0aaa6a4c..4e2ae66b46 100644
--- a/data/elementary/themes/default.edc
+++ b/data/elementary/themes/default.edc
@@ -10,15 +10,15 @@ data.item: "version" "119";
10data.item: "efl_theme_base" "dark"; 10data.item: "efl_theme_base" "dark";
11 11
12collections { 12collections {
13#include "ic.edc"
14
13#include "fonts.edc" 15#include "fonts.edc"
14#include "colorclasses.edc" 16#include "colorclasses.edc"
15 17
16// elm 18// elm
17#include "edc/elm/bg.edc" 19#include "edc/elm/bg.edc"
18#include "edc/elm/button.edc" 20#include "edc/elm/button.edc"
19// XXX: mobile mode needs invisible scrollers... make signals that do this
20#include "edc/elm/scroller.edc" 21#include "edc/elm/scroller.edc"
21// XXX: mobile mode needs different entry setup
22#include "edc/elm/entry.edc" 22#include "edc/elm/entry.edc"
23#include "edc/elm/frame.edc" 23#include "edc/elm/frame.edc"
24#include "edc/elm/label.edc" 24#include "edc/elm/label.edc"
@@ -66,7 +66,6 @@ collections {
66#include "edc/elm/panel.edc" 66#include "edc/elm/panel.edc"
67#include "edc/elm/popup.edc" 67#include "edc/elm/popup.edc"
68#include "edc/elm/border.edc" 68#include "edc/elm/border.edc"
69// XXX: min size calc problems - too wide! ... err ok on my 32bit box... eh?
70#include "edc/elm/spinner.edc" 69#include "edc/elm/spinner.edc"
71#include "edc/elm/menu.edc" 70#include "edc/elm/menu.edc"
72#include "edc/elm/clock.edc" 71#include "edc/elm/clock.edc"
@@ -176,11 +175,9 @@ collections {
176#include "edc/efl/calendar.edc" 175#include "edc/efl/calendar.edc"
177#include "edc/efl/navigation_bar.edc" 176#include "edc/efl/navigation_bar.edc"
178#include "edc/efl/navigation_layout.edc" 177#include "edc/efl/navigation_layout.edc"
179// XXX: mobile mode needs invisible scrollers... make signals that do this
180#include "edc/efl/scroller.edc" 178#include "edc/efl/scroller.edc"
181#include "edc/efl/list.edc" 179#include "edc/efl/list.edc"
182#include "edc/efl/grid.edc" 180#include "edc/efl/grid.edc"
183// XXX: mobile mode needs different entry setup
184#include "edc/efl/text.edc" 181#include "edc/efl/text.edc"
185#include "edc/efl/frame.edc" 182#include "edc/efl/frame.edc"
186#include "edc/efl/check.edc" 183#include "edc/efl/check.edc"
@@ -200,7 +197,6 @@ collections {
200#include "edc/efl/spin_button.edc" 197#include "edc/efl/spin_button.edc"
201#include "edc/efl/datepicker.edc" 198#include "edc/efl/datepicker.edc"
202#include "edc/efl/timepicker.edc" 199#include "edc/efl/timepicker.edc"
203// XXX: min size calc problems - too wide! ... err ok on my 32bit box... eh?
204#include "edc/efl/cursor.edc" 200#include "edc/efl/cursor.edc"
205#include "edc/efl/pointer.edc" 201#include "edc/efl/pointer.edc"
206#include "edc/efl/textpath.edc" 202#include "edc/efl/textpath.edc"
diff --git a/data/elementary/themes/edc/border.edc b/data/elementary/themes/edc/border.edc
index 5e419a72c8..beba2a99fc 100644
--- a/data/elementary/themes/edc/border.edc
+++ b/data/elementary/themes/edc/border.edc
@@ -126,9 +126,6 @@ group { name: "e/widgets/border/volume";
126 126
127group { name: "e/widgets/border/default/border"; 127group { name: "e/widgets/border/default/border";
128 alias: "e/widgets/border/shaped/border"; 128 alias: "e/widgets/border/shaped/border";
129 images.image: "border_close.png" COMP;
130 images.image: "border_maximize.png" COMP;
131 images.image: "border_minimize.png" COMP;
132 129
133 IMAGE_RING("ringa", 160) 130 IMAGE_RING("ringa", 160)
134 IMAGE_RING("ringb", 160) 131 IMAGE_RING("ringb", 160)
@@ -186,12 +183,12 @@ group { name: "e/widgets/border/default/border";
186 } 183 }
187 } 184 }
188 part { name: "top"; type: RECT; mouse_events: 0; 185 part { name: "top"; type: RECT; mouse_events: 0;
189// scale: 1; 186 scale: 1;
190 description { state: "default" 0.0; 187 description { state: "default" 0.0;
191 rel2.to_y: "e.text.title"; 188 rel2.to_y: "e.text.title";
192 rel2.offset: -1 3; 189 rel2.offset: -1 2;
193 color: 64 64 64 255; 190 color: 64 64 64 255;
194// offscale; 191 offscale;
195 } 192 }
196 description { state: "focused" 0.0; 193 description { state: "focused" 0.0;
197 inherit: "default" 0.0; 194 inherit: "default" 0.0;
@@ -202,10 +199,10 @@ group { name: "e/widgets/border/default/border";
202 scale: 1; 199 scale: 1;
203 description { state: "default" 0.0; 200 description { state: "default" 0.0;
204 rel1.relative: 1.0 0.0; 201 rel1.relative: 1.0 0.0;
205 rel1.offset: 1 3; 202 rel1.offset: 1 4;
206 rel1.to_x: "e.swallow.volume"; 203 rel1.to_x: "e.swallow.volume";
207 rel2.relative: 0.0 0.0; 204 rel2.relative: 0.0 0.0;
208 rel2.offset: -2 3; 205 rel2.offset: -2 4;
209 rel2.to_x: "e.event.minimize"; 206 rel2.to_x: "e.event.minimize";
210 align: 0.5 0.0; 207 align: 0.5 0.0;
211 color: 160 160 160 255; 208 color: 160 160 160 255;
@@ -216,7 +213,7 @@ group { name: "e/widgets/border/default/border";
216 min: 0 1; 213 min: 0 1;
217 } 214 }
218 fixed: 0 1; 215 fixed: 0 1;
219// offscale; 216 offscale;
220 } 217 }
221 description { state: "focused" 0.0; 218 description { state: "focused" 0.0;
222 inherit: "default" 0.0; 219 inherit: "default" 0.0;
@@ -278,8 +275,9 @@ group { name: "e/widgets/border/default/border";
278 } 275 }
279 } 276 }
280 part { name: "close1"; mouse_events: 0; 277 part { name: "close1"; mouse_events: 0;
278 scale: 1;
281 description { state: "default" 0.0; 279 description { state: "default" 0.0;
282 image.normal: "border_close.png"; 280 image.normal: "i-close";
283 rel.to: "e.event.close"; 281 rel.to: "e.event.close";
284 min: 15 15; max: 15 15; 282 min: 15 15; max: 15 15;
285 fixed: 1 1; 283 fixed: 1 1;
@@ -292,8 +290,9 @@ group { name: "e/widgets/border/default/border";
292 } 290 }
293 part { name: "max1"; mouse_events: 0; 291 part { name: "max1"; mouse_events: 0;
294 clip_to: "clip1"; 292 clip_to: "clip1";
293 scale: 1;
295 description { state: "default" 0.0; 294 description { state: "default" 0.0;
296 image.normal: "border_maximize.png"; 295 image.normal: "i-arrow-u";
297 rel.to: "e.event.maximize"; 296 rel.to: "e.event.maximize";
298 min: 15 15; max: 15 15; 297 min: 15 15; max: 15 15;
299 fixed: 1 1; 298 fixed: 1 1;
@@ -306,8 +305,9 @@ group { name: "e/widgets/border/default/border";
306 } 305 }
307 part { name: "min1"; mouse_events: 0; 306 part { name: "min1"; mouse_events: 0;
308 clip_to: "clip1"; 307 clip_to: "clip1";
308 scale: 1;
309 description { state: "default" 0.0; 309 description { state: "default" 0.0;
310 image.normal: "border_minimize.png"; 310 image.normal: "i-arrow-d";
311 rel.to: "e.event.minimize"; 311 rel.to: "e.event.minimize";
312 min: 15 15; max: 15 15; 312 min: 15 15; max: 15 15;
313 fixed: 1 1; 313 fixed: 1 1;
@@ -320,8 +320,9 @@ group { name: "e/widgets/border/default/border";
320 } 320 }
321 part { name: "close2"; mouse_events: 0; 321 part { name: "close2"; mouse_events: 0;
322 clip_to: "clip2"; 322 clip_to: "clip2";
323 scale: 1;
323 description { state: "default" 0.0; 324 description { state: "default" 0.0;
324 image.normal: "border_close.png"; 325 image.normal: "i-close";
325 rel.to: "e.event.close"; 326 rel.to: "e.event.close";
326 min: 15 15; max: 15 15; 327 min: 15 15; max: 15 15;
327 fixed: 1 1; 328 fixed: 1 1;
@@ -334,8 +335,9 @@ group { name: "e/widgets/border/default/border";
334 } 335 }
335 part { name: "max2"; mouse_events: 0; 336 part { name: "max2"; mouse_events: 0;
336 clip_to: "clip2"; 337 clip_to: "clip2";
338 scale: 1;
337 description { state: "default" 0.0; 339 description { state: "default" 0.0;
338 image.normal: "border_maximize.png"; 340 image.normal: "i-arrow-u";
339 rel.to: "e.event.maximize"; 341 rel.to: "e.event.maximize";
340 min: 15 15; max: 15 15; 342 min: 15 15; max: 15 15;
341 fixed: 1 1; 343 fixed: 1 1;
@@ -348,8 +350,9 @@ group { name: "e/widgets/border/default/border";
348 } 350 }
349 part { name: "min2"; mouse_events: 0; 351 part { name: "min2"; mouse_events: 0;
350 clip_to: "clip2"; 352 clip_to: "clip2";
353 scale: 1;
351 description { state: "default" 0.0; 354 description { state: "default" 0.0;
352 image.normal: "border_minimize.png"; 355 image.normal: "i-arrow-d";
353 rel.to: "e.event.minimize"; 356 rel.to: "e.event.minimize";
354 min: 15 15; max: 15 15; 357 min: 15 15; max: 15 15;
355 fixed: 1 1; 358 fixed: 1 1;
diff --git a/data/elementary/themes/edc/comp.edc b/data/elementary/themes/edc/comp.edc
index dc990e5137..3435a0ac35 100644
--- a/data/elementary/themes/edc/comp.edc
+++ b/data/elementary/themes/edc/comp.edc
@@ -6,9 +6,8 @@ group { name: "e/comp/preview";
6 } 6 }
7 part { name: "e.text.label"; type: TEXT; mouse_events: 0; 7 part { name: "e.text.label"; type: TEXT; mouse_events: 0;
8 scale: 1; 8 scale: 1;
9 effect: SHADOW BOTTOM;
10 description { state: "default" 0.0; 9 description { state: "default" 0.0;
11 color: FN_COL_DEFAULT; 10 color: 255 255 255 255;
12 text { font: FNBD; size: 10; 11 text { font: FNBD; size: 10;
13 text_class: "fileman_icon"; 12 text_class: "fileman_icon";
14 align: 0.5 0.5; 13 align: 0.5 0.5;
diff --git a/data/elementary/themes/edc/elm/border.edc b/data/elementary/themes/edc/elm/border.edc
index 579eb79b0b..69ff6af67b 100644
--- a/data/elementary/themes/edc/elm/border.edc
+++ b/data/elementary/themes/edc/elm/border.edc
@@ -8,14 +8,7 @@
8 */ 8 */
9 9
10group { name: "elm/border/base/default"; 10group { name: "elm/border/base/default";
11 images.image: "border_close.png" COMP; 11 images.image: "win_shad_flat.png" COMP;
12 images.image: "border_maximize.png" COMP;
13 images.image: "border_minimize.png" COMP;
14
15 images.image: "glow_round_corners_small.png" COMP;
16 images.image: "knob_round_small_busy.png" COMP;
17
18 images.image: "win_shadow.png" COMP;
19 data.item: "shadow" "1"; 12 data.item: "shadow" "1";
20 data.item: "version" "119"; 13 data.item: "version" "119";
21 parts { 14 parts {
@@ -37,10 +30,17 @@ group { name: "elm/border/base/default";
37 rel2.relative: 1.0 0.0; 30 rel2.relative: 1.0 0.0;
38 } 31 }
39 } 32 }
40 /* shadow spacer and clipper */ 33 part { name: "shadow_clip"; type: RECT; mouse_events: 0;
41 spacer { "shadow_spacer"; 34 description { state: "default";
35 rel.to: "_sh1";
36 }
37 description { state: "hidden";
38 visible: 0;
39 }
40 }
41 part { name: "shadow_base"; type: SPACER;
42 scale: 1; 42 scale: 1;
43 desc { "default"; 43 description { state: "default" 0.0;
44 WIN_SHADOW_SPACER; 44 WIN_SHADOW_SPACER;
45 } 45 }
46 desc { "hidden"; 46 desc { "hidden";
@@ -48,17 +48,9 @@ group { name: "elm/border/base/default";
48 rel2.offset: -1 -1; 48 rel2.offset: -1 -1;
49 } 49 }
50 } 50 }
51 image { "shadow"; nomouse; 51 WIN_SHAD("shadow_base", "shadow_clip", "win_shad_flat.png", 21, 21, 14, 28, 0.5)
52 scale: 1;
53 desc { "default";
54 rel.to: "shadow_spacer";
55 WIN_SHADOW;
56 }
57 desc { "hidden"; inherit: "default"; hid; }
58 }
59 /* window background: solid color */ 52 /* window background: solid color */
60 rect { "bg_clip"; 53 rect { "bg_clip"; nomouse;
61 nomouse;
62 desc { "default"; 54 desc { "default";
63 rel1.to: "top_clip"; 55 rel1.to: "top_clip";
64 rel1.relative: 0.0 1.0; 56 rel1.relative: 0.0 1.0;
@@ -69,8 +61,7 @@ group { name: "elm/border/base/default";
69 required; // @since 1.19 61 required; // @since 1.19
70 clip: "bg_clip"; 62 clip: "bg_clip";
71 desc { "default"; 63 desc { "default";
72 color: 255 255 255 255; 64 color: 64 64 64 255;
73 color_class: "elm/win/background"; // FIXME: color_class naming scheme
74 visible: 0; 65 visible: 0;
75 } 66 }
76 desc { "visible"; 67 desc { "visible";
@@ -101,6 +92,8 @@ group { name: "elm/border/base/default";
101 color: 64 64 64 255; // FIXME: color_class 92 color: 64 64 64 255; // FIXME: color_class
102 align: 0.5 0.0; 93 align: 0.5 0.0;
103 rel.to: "elm.swallow.menu"; 94 rel.to: "elm.swallow.menu";
95 fixed: 1 1;
96 visible: 0;
104 } 97 }
105 } 98 }
106 swallow { "elm.swallow.menu"; 99 swallow { "elm.swallow.menu";
@@ -108,12 +101,16 @@ group { name: "elm/border/base/default";
108 desc { "default"; 101 desc { "default";
109 rel.to: "top_clip"; 102 rel.to: "top_clip";
110 visible: 0; 103 visible: 0;
111 align: 0.5 0.0; 104 align: 0.5 1.0;
112 fixed: 1 1; 105 fixed: 1 1;
106 rel1.relative: 0.0 1.0;
107 rel1.offset: 0 -1;
113 } 108 }
114 desc { "visible"; inherit: "default"; 109 desc { "visible"; inherit: "default";
115 visible: 1; 110// rel1.offset: 0 0;
116 fixed: 0 1; 111// align: 0.5 0.0;
112// visible: 1;
113// fixed: 0 1;
117 } 114 }
118 } 115 }
119 116
@@ -162,21 +159,21 @@ group { name: "elm/border/base/default";
162 159
163 /* top title bar - spacer and clipper */ 160 /* top title bar - spacer and clipper */
164 rect { "top_clip"; //nomouse; 161 rect { "top_clip"; //nomouse;
165// scale: 1; 162 scale: 1;
166 desc { "default"; 163 desc { "default";
167 rel1.to: "shadow_spacer"; 164 rel1.to: "shadow_base";
165 rel2.to_x: "shadow_base";
168 rel2.to_y: "elm.text.title"; 166 rel2.to_y: "elm.text.title";
169 rel2.to_x: "shadow_spacer"; 167 rel2.offset: -1 2;
170 rel2.offset: -1 3;
171 vis; 168 vis;
172// offscale; 169 offscale;
173 } 170 }
174 desc { "hidden"; 171 desc { "hidden";
175 inherit: "default"; 172 inherit: "default";
176 rel1.to: ""; 173 rel1.to: "";
177 rel2.to: ""; 174 rel2.to: "";
178 rel1.relative: 0.0 0.0; 175 rel1.relative: 0.0 0.0;
179 rel2.to: "shadow_spacer"; 176 rel2.to: "shadow_base";
180 rel2.relative: 1.0 0.0; 177 rel2.relative: 1.0 0.0;
181 rel2.offset: -1 0; 178 rel2.offset: -1 0;
182 max: -1 0; 179 max: -1 0;
@@ -202,13 +199,13 @@ group { name: "elm/border/base/default";
202 clip: "top_clip"; 199 clip: "top_clip";
203 description { state: "default" 0.0; 200 description { state: "default" 0.0;
204 rel1.relative: 1.0 0.0; 201 rel1.relative: 1.0 0.0;
205 rel1.offset: 1 3; 202 rel1.offset: 1 4;
206 rel1.to_x: "icon"; 203 rel1.to_x: "icon";
207 rel1.to_y: "shadow_spacer"; 204 rel1.to_y: "shadow_base";
208 rel2.relative: 0.0 0.0; 205 rel2.relative: 0.0 0.0;
209 rel2.offset: -2 3; 206 rel2.offset: -2 4;
210 rel2.to_x: "elm.event.minimize"; 207 rel2.to_x: "elm.event.minimize";
211 rel2.to_y: "shadow_spacer"; 208 rel2.to_y: "shadow_base";
212 align: 0.5 0.0; 209 align: 0.5 0.0;
213 color: 160 160 160 255; 210 color: 160 160 160 255;
214 min: 0 16; 211 min: 0 16;
@@ -218,7 +215,7 @@ group { name: "elm/border/base/default";
218 min: 0 1; 215 min: 0 1;
219 } 216 }
220 fixed: 0 1; 217 fixed: 0 1;
221// offscale; 218 offscale;
222 } 219 }
223 description { state: "focused" 0.0; 220 description { state: "focused" 0.0;
224 inherit: "default" 0.0; 221 inherit: "default" 0.0;
@@ -250,49 +247,6 @@ group { name: "elm/border/base/default";
250 rel2.offset: 0 0; 247 rel2.offset: 0 0;
251 } 248 }
252 } 249 }
253 rect { "busy_clip"; nomouse;
254 desc { "default";
255 color: 255 255 255 0;
256 visible: 0;
257 }
258 desc { "hung";
259 inherit: "default";
260 color: 255 255 255 255;
261 visible: 1;
262 }
263 }
264 image { "knob"; nomouse;
265 clip: "busy_clip";
266 desc { "default";
267 fixed: 1 1;
268 image.normal: "knob_round_small_busy.png";
269 aspect: 1.0 1.0; aspect_preference: VERTICAL;
270 max: 20 20;
271 rel1.relative: 1.0 0.0;
272 rel1.offset: 2 -0;
273 rel1.to: "elm.event.icon";
274 rel2.relative: 1.0 1.0;
275 rel2.offset: 2 -1;
276 rel2.to: "elm.event.icon";
277 align: 0.0 0.5;
278 fixed: 1 1;
279 }
280 }
281 image { "knob_spinner"; nomouse;
282 clip: "busy_clip";
283 desc { "default";
284 fixed: 1 1;
285 rel.to: "knob";
286 image.normal: "glow_round_corners_small.png";
287 map.on: 1;
288 map.smooth: 1;
289 map.rotation.center: "knob";
290 }
291 desc { "spin";
292 inherit: "default";
293 map.rotation.z: 360;
294 }
295 }
296 rect { "clip1"; nomouse; 250 rect { "clip1"; nomouse;
297 desc { "default"; 251 desc { "default";
298 rel.to: "top_clip"; 252 rel.to: "top_clip";
@@ -314,8 +268,9 @@ group { name: "elm/border/base/default";
314 } 268 }
315 image { "close1"; nomouse; 269 image { "close1"; nomouse;
316 clip: "clip1"; 270 clip: "clip1";
271 scale: 1;
317 desc { "default"; 272 desc { "default";
318 image.normal: "border_close.png"; 273 image.normal: "i-close";
319 rel.to: "elm.event.close"; 274 rel.to: "elm.event.close";
320 min: 15 15; max: 15 15; 275 min: 15 15; max: 15 15;
321 fixed: 1 1; 276 fixed: 1 1;
@@ -328,8 +283,9 @@ group { name: "elm/border/base/default";
328 } 283 }
329 image { "max1"; nomouse; 284 image { "max1"; nomouse;
330 clip: "clip1"; 285 clip: "clip1";
286 scale: 1;
331 desc { "default"; 287 desc { "default";
332 image.normal: "border_maximize.png"; 288 image.normal: "i-arrow-u";
333 rel.to: "elm.event.maximize"; 289 rel.to: "elm.event.maximize";
334 min: 15 15; max: 15 15; 290 min: 15 15; max: 15 15;
335 fixed: 1 1; 291 fixed: 1 1;
@@ -342,8 +298,9 @@ group { name: "elm/border/base/default";
342 } 298 }
343 image { "min1"; nomouse; 299 image { "min1"; nomouse;
344 clip: "clip1"; 300 clip: "clip1";
301 scale: 1;
345 desc { "default"; 302 desc { "default";
346 image.normal: "border_minimize.png"; 303 image.normal: "i-arrow-d";
347 rel.to: "elm.event.minimize"; 304 rel.to: "elm.event.minimize";
348 min: 15 15; max: 15 15; 305 min: 15 15; max: 15 15;
349 fixed: 1 1; 306 fixed: 1 1;
@@ -356,44 +313,47 @@ group { name: "elm/border/base/default";
356 } 313 }
357 image { "close2"; nomouse; 314 image { "close2"; nomouse;
358 clip: "clip2"; 315 clip: "clip2";
316 scale: 1;
359 desc { "default"; 317 desc { "default";
360 image.normal: "border_close.png"; 318 image.normal: "i-close";
361 rel.to: "elm.event.close"; 319 rel.to: "elm.event.close";
362 min: 15 15; max: 15 15; 320 min: 15 15; max: 15 15;
363 fixed: 1 1; 321 fixed: 1 1;
364 color: 160 160 160 255; 322 color: 255 255 255 255;
365 } 323 }
366 desc { "selected"; 324 desc { "selected";
367 inherit: "default"; 325 inherit: "default";
368 color: 255 255 255 255; 326 color: 220 220 220 255;
369 } 327 }
370 } 328 }
371 image { "max2"; nomouse; 329 image { "max2"; nomouse;
372 clip: "clip2"; 330 clip: "clip2";
331 scale: 1;
373 desc { "default"; 332 desc { "default";
374 image.normal: "border_maximize.png"; 333 image.normal: "i-arrow-u";
375 rel.to: "elm.event.maximize"; 334 rel.to: "elm.event.maximize";
376 min: 15 15; max: 15 15; 335 min: 15 15; max: 15 15;
377 fixed: 1 1; 336 fixed: 1 1;
378 color: 160 160 160 255; 337 color: 255 255 255 255;
379 } 338 }
380 desc { "selected"; 339 desc { "selected";
381 inherit: "default"; 340 inherit: "default";
382 color: 255 255 255 255; 341 color: 220 220 220 255;
383 } 342 }
384 } 343 }
385 image { "min2"; nomouse; 344 image { "min2"; nomouse;
386 clip: "clip2"; 345 clip: "clip2";
346 scale: 1;
387 desc { "default"; 347 desc { "default";
388 image.normal: "border_minimize.png"; 348 image.normal: "i-arrow-d";
389 rel.to: "elm.event.minimize"; 349 rel.to: "elm.event.minimize";
390 min: 15 15; max: 15 15; 350 min: 15 15; max: 15 15;
391 fixed: 1 1; 351 fixed: 1 1;
392 color: 160 160 160 255; 352 color: 255 255 255 255;
393 } 353 }
394 desc { "selected"; 354 desc { "selected";
395 inherit: "default"; 355 inherit: "default";
396 color: 255 255 255 255; 356 color: 220 220 220 255;
397 } 357 }
398 } 358 }
399 rect { "elm.event.icon"; 359 rect { "elm.event.icon";
@@ -524,14 +484,16 @@ group { name: "elm/border/base/default";
524 rect { "bottom_clip"; 484 rect { "bottom_clip";
525 scale: 1; 485 scale: 1;
526 desc { "default"; 486 desc { "default";
527 rel.to: "shadow_spacer"; 487 rel.to: "shadow_base";
528 rel1 { relative: 0.0 1.0; offset: 0 -5; } 488 rel1 { relative: 0.0 1.0; offset: 0 -1; }
489 align: 0.0 1.0;
529 min: 0 5; 490 min: 0 5;
530 fixed: 0 1; 491 fixed: 0 1;
531 } 492 }
532 desc { "hidden"; 493 desc { "hidden";
533 inherit: "default"; 494 inherit: "default";
534 rel1 { relative: 0.0 1.0; offset: 0 0; } 495 rel1 { relative: 0.0 1.0; offset: 0 0; }
496 rel2 { relative: 1.0 1.0; offset: 0 0; }
535 min: 0 0; 497 min: 0 0;
536 hid; 498 hid;
537 } 499 }
@@ -671,12 +633,14 @@ group { name: "elm/border/base/default";
671 program { 633 program {
672 signal: "elm,state,shadow,on"; source: "elm"; 634 signal: "elm,state,shadow,on"; source: "elm";
673 action: STATE_SET "default"; 635 action: STATE_SET "default";
674 targets: "shadow_spacer" "shadow"; 636 target: "shadow_clip";
637 target: "shadow_base";
675 } 638 }
676 program { 639 program {
677 signal: "elm,state,shadow,off"; source: "elm"; 640 signal: "elm,state,shadow,off"; source: "elm";
678 action: STATE_SET "hidden"; 641 action: STATE_SET "hidden";
679 targets: "shadow_spacer" "shadow"; 642 target: "shadow_clip";
643 target: "shadow_base";
680 } 644 }
681 program { 645 program {
682 signal: "elm,state,background,solid,on"; source: "elm"; 646 signal: "elm,state,background,solid,on"; source: "elm";
@@ -737,41 +701,6 @@ group { name: "elm/border/base/default";
737 action: STATE_SET "default"; 701 action: STATE_SET "default";
738 target: "icon"; 702 target: "icon";
739 } 703 }
740 program { name: "spin";
741 signal: "elm,state,hung"; source: "elm";
742 action: STATE_SET "spin";
743 transition: LINEAR 1.0;
744 target: "knob_spinner";
745 after: "spin2";
746 }
747 program { name: "spin2";
748 action: STATE_SET "default";
749 target: "knob_spinner";
750 after: "spin";
751 }
752 program {
753 signal: "elm,state,hung"; source: "elm";
754 action: STATE_SET "hung";
755 transition: SINUSOIDAL 0.25;
756 target: "busy_clip";
757 }
758 program {
759 signal: "elm,state,unhung"; source: "elm";
760 action: STATE_SET "default";
761 transition: SINUSOIDAL 1.0;
762 target: "busy_clip";
763 after: "spin3";
764 }
765 program { name: "spin3";
766 action: ACTION_STOP;
767 target: "spin";
768 target: "spin2";
769 after: "spin4";
770 }
771 program { name: "spin4";
772 action: STATE_SET "default";
773 target: "knob_spinner";
774 }
775 704
776 /* maximize & unmaximize */ 705 /* maximize & unmaximize */
777 program { 706 program {
@@ -1096,25 +1025,22 @@ group { name: "elm/border/dialog/default";
1096 1025
1097group { name: "elm/border/naviframe/default"; 1026group { name: "elm/border/naviframe/default";
1098 inherit: "elm/border/dialog/default"; 1027 inherit: "elm/border/dialog/default";
1099 images.image: "sym_left_dark_normal.png" COMP;
1100 images.image: "sym_left_glow_normal.png" COMP;
1101 images.image: "sym_left_light_normal.png" COMP;
1102 parts { 1028 parts {
1103 image { "close1"; 1029 image { "close1";
1104 desc { "default"; 1030 desc { "default";
1105 image.normal: "sym_left_dark_normal.png"; 1031 image.normal: "i-arrow-l";
1106 } 1032 }
1107 desc { "selected"; 1033 desc { "selected";
1108 image.normal: "sym_left_glow_normal.png"; 1034 image.normal: "i-arrow-l";
1109 } 1035 }
1110 } 1036 }
1111 image { "close2"; nomouse; 1037 image { "close2"; nomouse;
1112 clip: "clip2"; 1038 clip: "clip2";
1113 desc { "default"; 1039 desc { "default";
1114 image.normal: "sym_left_light_normal.png"; 1040 image.normal: "i-arrow-l";
1115 } 1041 }
1116 desc { "selected"; 1042 desc { "selected";
1117 image.normal: "sym_left_glow_normal.png"; 1043 image.normal: "i-arrow-l";
1118 } 1044 }
1119 } 1045 }
1120 } 1046 }
diff --git a/data/elementary/themes/edc/elm/button.edc b/data/elementary/themes/edc/elm/button.edc
index 0e3464df42..6665bd4141 100644
--- a/data/elementary/themes/edc/elm/button.edc
+++ b/data/elementary/themes/edc/elm/button.edc
@@ -627,7 +627,7 @@ group { name: "elm/button/base/colorselector/left/default";
627 fixed: 1 1; 627 fixed: 1 1;
628 min: 15 15; 628 min: 15 15;
629 max: 15 15; 629 max: 15 15;
630 image.normal: "ic-arrow-l"; 630 image.normal: "i-arrow-l";
631 color: 160 160 160 255; 631 color: 160 160 160 255;
632 } 632 }
633 } 633 }
@@ -643,7 +643,7 @@ group { name: "elm/button/base/colorselector/right/default";
643 fixed: 1 1; 643 fixed: 1 1;
644 min: 15 15; 644 min: 15 15;
645 max: 15 15; 645 max: 15 15;
646 image.normal: "ic-arrow-r"; 646 image.normal: "i-arrow-r";
647 color: 160 160 160 255; 647 color: 160 160 160 255;
648 } 648 }
649 } 649 }
@@ -1178,18 +1178,6 @@ group { name: "elm/button/base/hoversel_horizontal_entry/default";
1178} 1178}
1179 1179
1180/******************* SPINNER BUTTONS STYLES **********************/ 1180/******************* SPINNER BUTTONS STYLES **********************/
1181#define IC(_NAME, _ICON) \
1182set { name: _NAME; \
1183 image {image: _ICON"-060.png" COMP; size: 31 31 60000 60000; } \
1184 image {image: _ICON"-030.png" COMP; size: 16 16 30 30; } \
1185 image {image: _ICON"-015.png" COMP; size: 0 0 15 15; } \
1186}
1187IC("ic-arrow-l", "arrow-l")
1188IC("ic-arrow-r", "arrow-r")
1189IC("ic-arrow-u", "arrow-u")
1190IC("ic-arrow-d", "arrow-d")
1191#undef IC
1192
1193 group { name: "elm/button/base/spinner/increase/default"; 1181 group { name: "elm/button/base/spinner/increase/default";
1194 alias: "elm/button/base/spinner/increase/colorselector/default"; 1182 alias: "elm/button/base/spinner/increase/colorselector/default";
1195 alias: "elm/button/base/spin_button/increase/default"; 1183 alias: "elm/button/base/spin_button/increase/default";
@@ -1204,7 +1192,7 @@ IC("ic-arrow-d", "arrow-d")
1204 scale: 1; 1192 scale: 1;
1205 description { state: "default" 0.0; 1193 description { state: "default" 0.0;
1206 FIXED_SIZE(15, 15) 1194 FIXED_SIZE(15, 15)
1207 image.normal: "ic-arrow-r"; 1195 image.normal: "i-arrow-r";
1208 color: 160 160 160 255; 1196 color: 160 160 160 255;
1209 } 1197 }
1210 description { state: "pressed" 0.0; 1198 description { state: "pressed" 0.0;
@@ -1335,13 +1323,13 @@ IC("ic-arrow-d", "arrow-d")
1335 parts { 1323 parts {
1336 part { name: "arrow.image"; 1324 part { name: "arrow.image";
1337 description { state: "default" 0.0; 1325 description { state: "default" 0.0;
1338 image.normal: "ic-arrow-l"; 1326 image.normal: "i-arrow-l";
1339 } 1327 }
1340 description { state: "pressed" 0.0; 1328 description { state: "pressed" 0.0;
1341 image.normal: "ic-arrow-l"; 1329 image.normal: "i-arrow-l";
1342 } 1330 }
1343 description { state: "disabled" 0.0; 1331 description { state: "disabled" 0.0;
1344 image.normal: "ic-arrow-l"; 1332 image.normal: "i-arrow-l";
1345 } 1333 }
1346 } 1334 }
1347 } 1335 }
@@ -1424,13 +1412,13 @@ IC("ic-arrow-d", "arrow-d")
1424 parts { 1412 parts {
1425 part { name: "arrow.image"; 1413 part { name: "arrow.image";
1426 description { state: "default" 0.0; 1414 description { state: "default" 0.0;
1427 image.normal: "ic-arrow-u"; 1415 image.normal: "i-arrow-u";
1428 } 1416 }
1429 description { state: "pressed" 0.0; 1417 description { state: "pressed" 0.0;
1430 image.normal: "ic-arrow-u"; 1418 image.normal: "i-arrow-u";
1431 } 1419 }
1432 description { state: "disabled" 0.0; 1420 description { state: "disabled" 0.0;
1433 image.normal: "ic-arrow-u"; 1421 image.normal: "i-arrow-u";
1434 } 1422 }
1435 } 1423 }
1436 } 1424 }
@@ -1445,13 +1433,13 @@ IC("ic-arrow-d", "arrow-d")
1445 parts { 1433 parts {
1446 part { name: "arrow.image"; 1434 part { name: "arrow.image";
1447 description { state: "default" 0.0; 1435 description { state: "default" 0.0;
1448 image.normal: "ic-arrow-d"; 1436 image.normal: "i-arrow-d";
1449 } 1437 }
1450 description { state: "pressed" 0.0; 1438 description { state: "pressed" 0.0;
1451 image.normal: "ic-arrow-d"; 1439 image.normal: "i-arrow-d";
1452 } 1440 }
1453 description { state: "disabled" 0.0; 1441 description { state: "disabled" 0.0;
1454 image.normal: "ic-arrow-d"; 1442 image.normal: "i-arrow-d";
1455 } 1443 }
1456 } 1444 }
1457 } 1445 }
diff --git a/data/elementary/themes/edc/elm/entry.edc b/data/elementary/themes/edc/elm/entry.edc
index 4c3f3b8939..6cdb311c82 100644
--- a/data/elementary/themes/edc/elm/entry.edc
+++ b/data/elementary/themes/edc/elm/entry.edc
@@ -3,7 +3,7 @@ group { name: "elm/scroller/entry/default";
3 parts { 3 parts {
4 part { name: "bg"; 4 part { name: "bg";
5 description { state: "default" 0.0; 5 description { state: "default" 0.0;
6 color: DARK_GREY_BG_COLOR; 6 color: 48 48 48 255;
7 } 7 }
8 } 8 }
9 part { name: "validation_glow"; type: RECT; mouse_events: 0; 9 part { name: "validation_glow"; type: RECT; mouse_events: 0;
@@ -40,9 +40,8 @@ group { name: "elm/scroller/entry/default";
40 insert_before: "elm.swallow.content"; 40 insert_before: "elm.swallow.content";
41 scale: 1; 41 scale: 1;
42 description { state: "default" 0.0; 42 description { state: "default" 0.0;
43 rel1.to: "bg"; 43 rel.to: "bg";
44 rel1.relative: 0.0 1.0; 44 rel1.relative: 0.0 1.0;
45 rel2.to: "bg";
46 rel1.offset: 0 0; 45 rel1.offset: 0 0;
47 color: 51 153 255 0; 46 color: 51 153 255 0;
48 visible: 0; 47 visible: 0;
@@ -55,26 +54,27 @@ group { name: "elm/scroller/entry/default";
55 visible: 1; 54 visible: 1;
56 } 55 }
57 } 56 }
58 program { 57 program { signal: "elm,action,focus_highlight,show"; source: "elm";
59 signal: "elm,action,focus_highlight,show"; source: "elm";
60 action: STATE_SET "focused" 0.0; 58 action: STATE_SET "focused" 0.0;
61 transition: DECELERATE 0.3; 59 transition: DECELERATE 0.3;
62 target: "glow"; 60 target: "glow";
63 } 61 }
64 program { 62 program { signal: "elm,action,focus_highlight,hide"; source: "elm";
65 signal: "elm,action,focus_highlight,hide"; source: "elm";
66 action: STATE_SET "default" 0.0; 63 action: STATE_SET "default" 0.0;
67 transition: DECELERATE 0.3; 64 transition: DECELERATE 0.3;
68 target: "glow"; 65 target: "glow";
69 } 66 }
70 part { name: "elm.swallow.content"; 67 part { name: "elm.swallow.content";
68 scale: 1;
69 clip_to: "clipper";
71 description { state: "default" 0.0; 70 description { state: "default" 0.0;
72 rel1.to: "elm.swallow.icon"; 71 rel1.to_x: "elm.swallow.icon";
73 rel1.relative: 1.0 0.0; 72 rel1.relative: 1.0 0.0;
74 rel1.offset: 0 0; 73 rel1.offset: 2 2;
75 rel2.to: "elm.swallow.end"; 74 rel2.to_x: "elm.swallow.end";
76 rel2.relative: 0.0 1.0; 75 rel2.relative: 0.0 1.0;
77 rel2.offset: -1 -1; 76 rel2.offset: -3 -3;
77 offscale;
78 } 78 }
79 } 79 }
80 part { name: "elm.swallow.icon"; type: SWALLOW; 80 part { name: "elm.swallow.icon"; type: SWALLOW;
@@ -82,10 +82,9 @@ group { name: "elm/scroller/entry/default";
82 scale: 1; 82 scale: 1;
83 description { state: "default" 0.0; 83 description { state: "default" 0.0;
84 fixed: 1 1; 84 fixed: 1 1;
85 rel1.to: "bg"; 85 rel.to: "bg";
86 rel1.offset: 0 2; 86 rel1.offset: -1 2;
87 rel2.to: "bg"; 87 rel2.offset: -1 -3;
88 rel2.offset: 0 -3;
89 rel2.relative: 0.0 1.0; 88 rel2.relative: 0.0 1.0;
90 visible: 0; 89 visible: 0;
91 align: 0.0 0.5; 90 align: 0.0 0.5;
@@ -101,13 +100,11 @@ group { name: "elm/scroller/entry/default";
101 aspect: 1.0 1.0; 100 aspect: 1.0 1.0;
102 } 101 }
103 } 102 }
104 program { 103 program { signal: "elm,action,show,icon"; source: "elm";
105 signal: "elm,action,show,icon"; source: "elm";
106 action: STATE_SET "visible" 0.0; 104 action: STATE_SET "visible" 0.0;
107 target: "elm.swallow.icon"; 105 target: "elm.swallow.icon";
108 } 106 }
109 program { 107 program { signal: "elm,action,hide,icon"; source: "elm";
110 signal: "elm,action,hide,icon"; source: "elm";
111 action: STATE_SET "default" 0.0; 108 action: STATE_SET "default" 0.0;
112 target: "elm.swallow.icon"; 109 target: "elm.swallow.icon";
113 } 110 }
@@ -116,10 +113,9 @@ group { name: "elm/scroller/entry/default";
116 scale: 1; 113 scale: 1;
117 description { state: "default" 0.0; 114 description { state: "default" 0.0;
118 fixed: 1 1; 115 fixed: 1 1;
119 rel1.to: "bg"; 116 rel.to: "bg";
120 rel1.offset: 0 2; 117 rel1.offset: 0 2;
121 rel1.relative: 1.0 0.0; 118 rel1.relative: 1.0 0.0;
122 rel2.to: "bg";
123 rel2.offset: 0 -3; 119 rel2.offset: 0 -3;
124 visible: 0; 120 visible: 0;
125 align: 1.0 0.5; 121 align: 1.0 0.5;
@@ -135,13 +131,11 @@ group { name: "elm/scroller/entry/default";
135 aspect: 1.0 1.0; 131 aspect: 1.0 1.0;
136 } 132 }
137 } 133 }
138 program { 134 program { signal: "elm,action,show,end"; source: "elm";
139 signal: "elm,action,show,end"; source: "elm";
140 action: STATE_SET "visible" 0.0; 135 action: STATE_SET "visible" 0.0;
141 target: "elm.swallow.end"; 136 target: "elm.swallow.end";
142 } 137 }
143 program { 138 program { signal: "elm,action,hide,end"; source: "elm";
144 signal: "elm,action,hide,end"; source: "elm";
145 action: STATE_SET "default" 0.0; 139 action: STATE_SET "default" 0.0;
146 target: "elm.swallow.end"; 140 target: "elm.swallow.end";
147 } 141 }
@@ -201,10 +195,8 @@ group { name: "elm/scroller/entry_single/default";
201 } 195 }
202 part { name: "bg"; type: RECT; 196 part { name: "bg"; type: RECT;
203 description { state: "default" 0.0; 197 description { state: "default" 0.0;
204 rel1.to: "elm.swallow.background"; 198 rel.to: "elm.swallow.background";
205 rel2.to: "elm.swallow.background"; 199 color: 48 48 48 255;
206 color: DARK_GREY_BG_COLOR;
207 color_class: "scroller_bg";
208 } 200 }
209 } 201 }
210 part { name: "elm.swallow.background"; type: SWALLOW; 202 part { name: "elm.swallow.background"; type: SWALLOW;
@@ -226,9 +218,8 @@ group { name: "elm/scroller/entry_single/default";
226 part { name: "glow"; type: RECT; mouse_events: 0; 218 part { name: "glow"; type: RECT; mouse_events: 0;
227 scale: 1; 219 scale: 1;
228 description { state: "default" 0.0; 220 description { state: "default" 0.0;
229 rel1.to: "bg"; 221 rel.to: "bg";
230 rel1.relative: 0.0 1.0; 222 rel1.relative: 0.0 1.0;
231 rel2.to: "bg";
232 rel1.offset: 0 0; 223 rel1.offset: 0 0;
233 color: 51 153 255 0; 224 color: 51 153 255 0;
234 visible: 0; 225 visible: 0;
@@ -241,14 +232,12 @@ group { name: "elm/scroller/entry_single/default";
241 visible: 1; 232 visible: 1;
242 } 233 }
243 } 234 }
244 program { 235 program { signal: "elm,action,focus_highlight,show"; source: "elm";
245 signal: "elm,action,focus_highlight,show"; source: "elm";
246 action: STATE_SET "focused" 0.0; 236 action: STATE_SET "focused" 0.0;
247 transition: DECELERATE 0.2; 237 transition: DECELERATE 0.2;
248 target: "glow"; 238 target: "glow";
249 } 239 }
250 program { 240 program { signal: "elm,action,focus_highlight,hide"; source: "elm";
251 signal: "elm,action,focus_highlight,hide"; source: "elm";
252 action: STATE_SET "default" 0.0; 241 action: STATE_SET "default" 0.0;
253 transition: DECELERATE 0.2; 242 transition: DECELERATE 0.2;
254 target: "glow"; 243 target: "glow";
@@ -271,6 +260,7 @@ group { name: "elm/scroller/entry_single/default";
271 scale: 1; 260 scale: 1;
272 clip_to: "clipper"; 261 clip_to: "clipper";
273 description { state: "default" 0.0; 262 description { state: "default" 0.0;
263 fixed: 1 1;
274 rel2.relative: 0.0 1.0; 264 rel2.relative: 0.0 1.0;
275 rel1.offset: -1 2; 265 rel1.offset: -1 2;
276 rel2.offset: -1 -3; 266 rel2.offset: -1 -3;
@@ -288,13 +278,11 @@ group { name: "elm/scroller/entry_single/default";
288 aspect: 1.0 1.0; 278 aspect: 1.0 1.0;
289 } 279 }
290 } 280 }
291 program { 281 program { signal: "elm,action,show,icon"; source: "elm";
292 signal: "elm,action,show,icon"; source: "elm";
293 action: STATE_SET "visible" 0.0; 282 action: STATE_SET "visible" 0.0;
294 target: "elm.swallow.icon"; 283 target: "elm.swallow.icon";
295 } 284 }
296 program { 285 program { signal: "elm,action,hide,icon"; source: "elm";
297 signal: "elm,action,hide,icon"; source: "elm";
298 action: STATE_SET "default" 0.0; 286 action: STATE_SET "default" 0.0;
299 target: "elm.swallow.icon"; 287 target: "elm.swallow.icon";
300 } 288 }
@@ -303,6 +291,7 @@ group { name: "elm/scroller/entry_single/default";
303 scale: 1; 291 scale: 1;
304 clip_to: "clipper"; 292 clip_to: "clipper";
305 description { state: "default" 0.0; 293 description { state: "default" 0.0;
294 fixed: 1 1;
306 rel1.relative: 1.0 0.0; 295 rel1.relative: 1.0 0.0;
307 rel1.offset: 0 2; 296 rel1.offset: 0 2;
308 rel2.offset: 0 -3; 297 rel2.offset: 0 -3;
@@ -320,13 +309,11 @@ group { name: "elm/scroller/entry_single/default";
320 aspect: 1.0 1.0; 309 aspect: 1.0 1.0;
321 } 310 }
322 } 311 }
323 program { 312 program { signal: "elm,action,show,end"; source: "elm";
324 signal: "elm,action,show,end"; source: "elm";
325 action: STATE_SET "visible" 0.0; 313 action: STATE_SET "visible" 0.0;
326 target: "elm.swallow.end"; 314 target: "elm.swallow.end";
327 } 315 }
328 program { 316 program { signal: "elm,action,hide,end"; source: "elm";
329 signal: "elm,action,hide,end"; source: "elm";
330 action: STATE_SET "default" 0.0; 317 action: STATE_SET "default" 0.0;
331 target: "elm.swallow.end"; 318 target: "elm.swallow.end";
332 } 319 }
diff --git a/data/elementary/themes/edc/elm/gengrid.edc b/data/elementary/themes/edc/elm/gengrid.edc
index ecf71e6cbc..055f213bee 100644
--- a/data/elementary/themes/edc/elm/gengrid.edc
+++ b/data/elementary/themes/edc/elm/gengrid.edc
@@ -473,7 +473,7 @@ group { name: "elm/gengrid/item/album-preview/default";
473 description { state: "default" 0.0; 473 description { state: "default" 0.0;
474 aspect: 1.0 1.0; aspect_preference: BOTH; 474 aspect: 1.0 1.0; aspect_preference: BOTH;
475 rel.to: "icon_area"; 475 rel.to: "icon_area";
476 image.normal: "efm_folder_icon"; 476 image.normal: "i-folder";
477 } 477 }
478 } 478 }
479 part { name: "elm.swallow.icon.1"; type: SWALLOW; mouse_events: 0; 479 part { name: "elm.swallow.icon.1"; type: SWALLOW; mouse_events: 0;
diff --git a/data/elementary/themes/edc/elm/panel.edc b/data/elementary/themes/edc/elm/panel.edc
index 9968d9567a..cf153ffc21 100644
--- a/data/elementary/themes/edc/elm/panel.edc
+++ b/data/elementary/themes/edc/elm/panel.edc
@@ -361,20 +361,6 @@ group { name: "elm/scroller/panel/bottom/default";
361 } 361 }
362} 362}
363 363
364#define IC(_NAME, _ICON) \
365 set { name: _NAME; \
366 image {image: _ICON"-060.png" COMP; size: 31 31 60000 60000; } \
367 image {image: _ICON"-030.png" COMP; size: 16 16 30 30; } \
368 image {image: _ICON"-015.png" COMP; size: 0 0 15 15; } \
369 }
370IC("ic-arrow-l", "arrow-l")
371IC("ic-arrow-r", "arrow-r")
372IC("ic-arrow-u", "arrow-u")
373IC("ic-arrow-d", "arrow-d")
374IC("ic-reload", "reload")
375IC("ic-heart", "heart")
376#undef IC
377
378group { name: "elm/panel/left/default"; 364group { name: "elm/panel/left/default";
379 data.item: "focus_highlight" "on"; 365 data.item: "focus_highlight" "on";
380 script { 366 script {
@@ -456,11 +442,11 @@ group { name: "elm/panel/left/default";
456 fixed: 1 1; 442 fixed: 1 1;
457 min: 30 30; max: 30 30; 443 min: 30 30; max: 30 30;
458 rel.to: "btn"; 444 rel.to: "btn";
459 image.normal: "ic-arrow-l"; 445 image.normal: "i-arrow-l";
460 } 446 }
461 description { state: "hidden" 0.0; 447 description { state: "hidden" 0.0;
462 inherit: "default" 0.0; 448 inherit: "default" 0.0;
463 image.normal: "ic-arrow-r"; 449 image.normal: "i-arrow-r";
464 } 450 }
465 } 451 }
466 } 452 }
@@ -631,10 +617,10 @@ group { name: "elm/panel/right/default";
631 } 617 }
632 part { name: "icn"; 618 part { name: "icn";
633 description { state: "default" 0.0; 619 description { state: "default" 0.0;
634 image.normal: "ic-arrow-r"; 620 image.normal: "i-arrow-r";
635 } 621 }
636 description { state: "hidden" 0.0; 622 description { state: "hidden" 0.0;
637 image.normal: "ic-arrow-l"; 623 image.normal: "i-arrow-l";
638 } 624 }
639 } 625 }
640 } 626 }
@@ -681,10 +667,10 @@ group { name: "elm/panel/top/default";
681 } 667 }
682 part { name: "icn"; 668 part { name: "icn";
683 description { state: "default" 0.0; 669 description { state: "default" 0.0;
684 image.normal: "ic-arrow-u"; 670 image.normal: "i-arrow-u";
685 } 671 }
686 description { state: "hidden" 0.0; 672 description { state: "hidden" 0.0;
687 image.normal: "ic-arrow-d"; 673 image.normal: "i-arrow-d";
688 } 674 }
689 } 675 }
690 } 676 }
@@ -765,10 +751,10 @@ group { name: "elm/panel/bottom/default";
765 } 751 }
766 part { name: "icn"; 752 part { name: "icn";
767 description { state: "default" 0.0; 753 description { state: "default" 0.0;
768 image.normal: "ic-arrow-d"; 754 image.normal: "i-arrow-d";
769 } 755 }
770 description { state: "hidden" 0.0; 756 description { state: "hidden" 0.0;
771 image.normal: "ic-arrow-u"; 757 image.normal: "i-arrow-u";
772 } 758 }
773 } 759 }
774 } 760 }
diff --git a/data/elementary/themes/edc/elm/pointer.edc b/data/elementary/themes/edc/elm/pointer.edc
index 26336b1440..350786e190 100644
--- a/data/elementary/themes/edc/elm/pointer.edc
+++ b/data/elementary/themes/edc/elm/pointer.edc
@@ -3,11 +3,10 @@ group { name: "elm/pointer/base/default";
3 image: "pointer.png" COMP; 3 image: "pointer.png" COMP;
4 } 4 }
5 parts { 5 parts {
6 part { 6 part { name: "base";
7 name: "base";
8 mouse_events: 0; 7 mouse_events: 0;
9 description { 8 scale: 1;
10 state: "default" 0.0; 9 description { state: "default" 0.0;
11 aspect: 1.0 1.0; 10 aspect: 1.0 1.0;
12 min: 32 32; 11 min: 32 32;
13 /* force a specific aspect ratio so 12 /* force a specific aspect ratio so
@@ -22,45 +21,36 @@ group { name: "elm/pointer/base/default";
22 } 21 }
23 } 22 }
24 } 23 }
25 part { 24 part { name: "elm.swallow.hotspot"; type: SWALLOW;
26 name: "elm.swallow.hotspot";
27 /* this is a "fake" swallow part 25 /* this is a "fake" swallow part
28 * that is used by e to determine 26 * that is used by e to determine
29 * the pointer hotspot - or where 27 * the pointer hotspot - or where
30 * the actual mouse events get 28 * the actual mouse events get
31 * reported from on the cursor */ 29 * reported from on the cursor */
32 type: SWALLOW; 30 description { state: "default" 0.0;
33 description {
34 state: "default" 0.0;
35 visible: 0; 31 visible: 0;
36 fixed: 1 1; 32 fixed: 1 1;
37 rel1 { 33 rel1 { to: "base";
38 /* the hotspot will scale with the cursor here */ 34 /* the hotspot will scale with the cursor here */
39 to: "base";
40 relative: 0.1875 0.1875; 35 relative: 0.1875 0.1875;
41 offset: 0 0; 36 offset: 0 0;
42 } 37 }
43 rel2 { 38 rel2 { to: "base";
44 to: "base";
45 relative: 0.1875 0.1875; 39 relative: 0.1875 0.1875;
46 offset: 0 0; 40 offset: 0 0;
47 } 41 }
48 } 42 }
49 } 43 }
50 } 44 }
51 programs {
52 }
53} 45}
54 46
55group { name: "elm/pointer/base/bottom_right_corner"; 47group { name: "elm/pointer/base/bottom_right_corner";
56 inherit: "elm/pointer/base/default"; 48 inherit: "elm/pointer/base/default";
57 images.image: "mini_box_glow.png" COMP;
58 parts { 49 parts {
59 part { name: "box"; 50 part { name: "box"; type: RECT;
60 insert_after: "base"; 51 insert_after: "base";
61 description { state: "default" 0.0; 52 description { state: "default" 0.0;
62 image.normal: "mini_box_glow.png"; 53 color: 51 153 255 192;
63 image.border: 7 7 7 7;
64 rel1.relative: 0.3 0.3; 54 rel1.relative: 0.3 0.3;
65 rel2.relative: 0.7 0.7; 55 rel2.relative: 0.7 0.7;
66 } 56 }
@@ -202,13 +192,11 @@ group { name: "elm/pointer/base/right_side";
202 192
203group { name: "elm/pointer/base/hand1"; 193group { name: "elm/pointer/base/hand1";
204 inherit: "elm/pointer/base/default"; 194 inherit: "elm/pointer/base/default";
205 images.image: "mini_box_glow.png" COMP;
206 parts { 195 parts {
207 part { name: "box"; 196 part { name: "box"; type: RECT;
208 insert_after: "base"; 197 insert_after: "base";
209 description { state: "default" 0.0; 198 description { state: "default" 0.0;
210 image.normal: "mini_box_glow.png"; 199 color: 51 153 255 192;
211 image.border: 7 7 7 7;
212 rel1.relative: 0.5 0.5; 200 rel1.relative: 0.5 0.5;
213 rel2.relative: 1.0 1.0; 201 rel2.relative: 1.0 1.0;
214 } 202 }
@@ -277,13 +265,11 @@ group { name: "elm/pointer/base/move";
277 265
278group { name: "elm/pointer/base/rotate"; 266group { name: "elm/pointer/base/rotate";
279 inherit: "elm/pointer/base/default"; 267 inherit: "elm/pointer/base/default";
280 images.image: "mini_box_glow.png" COMP;
281 parts { 268 parts {
282 part { name: "box"; 269 part { name: "box"; type: RECT;
283 insert_after: "base"; 270 insert_after: "base";
284 description { state: "default" 0.0; 271 description { state: "default" 0.0;
285 image.normal: "mini_box_glow.png"; 272 color: 51 153 255 192;
286 image.border: 7 7 7 7;
287 rel1.relative: 0.3 0.3; 273 rel1.relative: 0.3 0.3;
288 rel2.relative: 0.8 0.8; 274 rel2.relative: 0.8 0.8;
289 map.on: 1; 275 map.on: 1;
@@ -361,39 +347,26 @@ group { name: "elm/pointer/base/plus";
361} 347}
362 348
363group { name: "elm/pointer/base/xterm"; 349group { name: "elm/pointer/base/xterm";
364 images.image: "therm_base.png" COMP; 350 images.image: "pointer_entry.png" COMP;
365 images.image: "led_dot_white.png" COMP;
366 parts { 351 parts {
367 part { name: "base"; 352 part { name: "base";
353 scale: 1;
368 description { state: "default" 0.0; 354 description { state: "default" 0.0;
369 image.normal: "therm_base.png"; 355 image.normal: "pointer_entry.png";
370 max: 15 99999; 356 aspect: (44/88) (44/88); aspect_preference: VERTICAL;
371 min: 15 20; 357 FIXED_SIZE(32, 32)
372 image.normal: "therm_base.png";
373 image.border: 0 0 10 10;
374 rel1.offset: 0 2;
375 rel2.offset: -1 -3;
376 } 358 }
377 } 359 }
378 part { name: "elm.swallow.hotspot"; type: SWALLOW; 360 part { name: "elm.swallow.hotspot"; type: SWALLOW;
379 description { state: "default" 0.0; 361 description { state: "default" 0.0;
380 fixed: 1 1; 362 fixed: 1 1;
381 visible: 0; 363 visible: 0;
382 rel1.relative: 0.5 0.5;
383 rel1.to: "base"; 364 rel1.to: "base";
365 rel1.relative: 0.5 0.5;
384 rel2.to: "base"; 366 rel2.to: "base";
385 rel2.relative: 0.5 0.5; 367 rel2.relative: 0.5 0.5;
386 rel2.offset: 0 0; 368 rel2.offset: 0 0;
387 } 369 }
388 } 370 }
389 part { name: "shine";
390 description { state: "default" 0.0;
391 rel1.to: "base";
392 rel2.to: "base";
393 image.normal: "led_dot_white.png";
394 max: 27 27;
395 aspect: 1.0 1.0; aspect_preference: VERTICAL;
396 }
397 }
398 } 371 }
399} 372}
diff --git a/data/elementary/themes/edc/elm/toolbar.edc b/data/elementary/themes/edc/elm/toolbar.edc
index b9ca677492..dbda5b9ff8 100644
--- a/data/elementary/themes/edc/elm/toolbar.edc
+++ b/data/elementary/themes/edc/elm/toolbar.edc
@@ -1,18 +1,4 @@
1// === toolbar default base with scrolling arrows etc. 1// === toolbar default base with scrolling arrows etc.
2#define IC(_NAME, _ICON) \
3set { name: _NAME; \
4image {image: _ICON"-060.png" COMP; size: 31 31 60000 60000; } \
5image {image: _ICON"-030.png" COMP; size: 16 16 30 30; } \
6image {image: _ICON"-015.png" COMP; size: 0 0 15 15; } \
7}
8IC("ic-arrow-l", "arrow-l")
9IC("ic-arrow-r", "arrow-r")
10IC("ic-arrow-u", "arrow-u")
11IC("ic-arrow-d", "arrow-d")
12IC("ic-reload", "reload")
13IC("ic-heart", "heart")
14#undef IC
15
16group { name: "elm/toolbar/base/default"; 2group { name: "elm/toolbar/base/default";
17 parts { 3 parts {
18 part { name: "base"; type: RECT; 4 part { name: "base"; type: RECT;
@@ -61,7 +47,7 @@ group { name: "elm/toolbar/base/default";
61 description { state: "default" 0.0; 47 description { state: "default" 0.0;
62 fixed: 1 1; 48 fixed: 1 1;
63 rel.to: "arrow_l_ev"; 49 rel.to: "arrow_l_ev";
64 image.normal: "ic-arrow-l"; 50 image.normal: "i-arrow-l";
65 FIXED_SIZE(15, 15) 51 FIXED_SIZE(15, 15)
66 color: 160 160 160 255; 52 color: 160 160 160 255;
67 } 53 }
@@ -101,7 +87,7 @@ group { name: "elm/toolbar/base/default";
101 description { state: "default" 0.0; 87 description { state: "default" 0.0;
102 fixed: 1 1; 88 fixed: 1 1;
103 rel.to: "arrow_r_ev"; 89 rel.to: "arrow_r_ev";
104 image.normal: "ic-arrow-r"; 90 image.normal: "i-arrow-r";
105 FIXED_SIZE(15, 15) 91 FIXED_SIZE(15, 15)
106 color: 160 160 160 255; 92 color: 160 160 160 255;
107 } 93 }
@@ -141,7 +127,7 @@ group { name: "elm/toolbar/base/default";
141 description { state: "default" 0.0; 127 description { state: "default" 0.0;
142 fixed: 1 1; 128 fixed: 1 1;
143 rel.to: "arrow_u_ev"; 129 rel.to: "arrow_u_ev";
144 image.normal: "ic-arrow-u"; 130 image.normal: "i-arrow-u";
145 FIXED_SIZE(15, 15) 131 FIXED_SIZE(15, 15)
146 color: 160 160 160 255; 132 color: 160 160 160 255;
147 } 133 }
@@ -181,7 +167,7 @@ group { name: "elm/toolbar/base/default";
181 description { state: "default" 0.0; 167 description { state: "default" 0.0;
182 fixed: 1 1; 168 fixed: 1 1;
183 rel.to: "arrow_d_ev"; 169 rel.to: "arrow_d_ev";
184 image.normal: "ic-arrow-d"; 170 image.normal: "i-arrow-d";
185 FIXED_SIZE(15, 15) 171 FIXED_SIZE(15, 15)
186 color: 160 160 160 255; 172 color: 160 160 160 255;
187 } 173 }
diff --git a/data/elementary/themes/edc/fileman.edc b/data/elementary/themes/edc/fileman.edc
index 0d85c25bec..af999f6be8 100644
--- a/data/elementary/themes/edc/fileman.edc
+++ b/data/elementary/themes/edc/fileman.edc
@@ -1,17 +1,3 @@
1#define IC(_NAME, _ICON) \
2set { name: _NAME; \
3 image {image: _ICON"-060.png" COMP; size: 31 31 60000 60000; } \
4 image {image: _ICON"-030.png" COMP; size: 16 16 30 30; } \
5 image {image: _ICON"-015.png" COMP; size: 0 0 15 15; } \
6}
7IC("ic-arrow-l", "arrow-l")
8IC("ic-arrow-r", "arrow-r")
9IC("ic-arrow-u", "arrow-u")
10IC("ic-arrow-d", "arrow-d")
11IC("ic-reload", "reload")
12IC("ic-heart", "heart")
13#undef IC
14
15group { name: "e/fileman/default/list/variable"; 1group { name: "e/fileman/default/list/variable";
16 alias: "e/fileman/default/list/fixed"; 2 alias: "e/fileman/default/list/fixed";
17// data.item: "stacking" "above"; 3// data.item: "stacking" "above";
@@ -1070,7 +1056,7 @@ group { name: "e/fileman/default/list/drop_in";
1070 align: 0.5 0.0; 1056 align: 0.5 0.0;
1071 rel1.relative: 0.0 -1.0; 1057 rel1.relative: 0.0 -1.0;
1072 rel2.relative: 1.0 0.0; 1058 rel2.relative: 1.0 0.0;
1073 image.normal: "ic-arrow-d"; 1059 image.normal: "i-arrow-d";
1074 FIXED_SIZE(15, 15) 1060 FIXED_SIZE(15, 15)
1075 color: 51 153 255 255; 1061 color: 51 153 255 255;
1076 visible: 0; 1062 visible: 0;
@@ -1094,7 +1080,7 @@ group { name: "e/fileman/default/list/drop_in";
1094 align: 0.5 1.0; 1080 align: 0.5 1.0;
1095 rel1.relative: 0.0 1.0; 1081 rel1.relative: 0.0 1.0;
1096 rel2.relative: 1.0 2.0; 1082 rel2.relative: 1.0 2.0;
1097 image.normal: "ic-arrow-u"; 1083 image.normal: "i-arrow-u";
1098 FIXED_SIZE(15, 15) 1084 FIXED_SIZE(15, 15)
1099 color: 51 153 255 255; 1085 color: 51 153 255 255;
1100 visible: 0; 1086 visible: 0;
@@ -1170,7 +1156,7 @@ group { name: "e/fileman/default/list/drop_between";
1170 align: 0.5 0.0; 1156 align: 0.5 0.0;
1171 rel1.offset: 0 -40; 1157 rel1.offset: 0 -40;
1172 rel2.relative: 1.0 0.0; 1158 rel2.relative: 1.0 0.0;
1173 image.normal: "ic-arrow-d"; 1159 image.normal: "i-arrow-d";
1174 FIXED_SIZE(15, 15) 1160 FIXED_SIZE(15, 15)
1175 color: 51 153 255 255; 1161 color: 51 153 255 255;
1176 visible: 0; 1162 visible: 0;
@@ -1195,7 +1181,7 @@ group { name: "e/fileman/default/list/drop_between";
1195 align: 0.5 1.0; 1181 align: 0.5 1.0;
1196 rel1.relative: 0.0 1.0; 1182 rel1.relative: 0.0 1.0;
1197 rel2.offset: -1 39; 1183 rel2.offset: -1 39;
1198 image.normal: "ic-arrow-u"; 1184 image.normal: "i-arrow-u";
1199 FIXED_SIZE(15, 15) 1185 FIXED_SIZE(15, 15)
1200 color: 51 153 255 255; 1186 color: 51 153 255 255;
1201 visible: 0; 1187 visible: 0;
@@ -1526,7 +1512,7 @@ group { name: "e/modules/efm_navigation/main";
1526 description { state: "default" 0.0; \ 1512 description { state: "default" 0.0; \
1527 rel1.to: _REL; \ 1513 rel1.to: _REL; \
1528 rel2.to: _REL; \ 1514 rel2.to: _REL; \
1529 image.normal: "ic-"_ICON; \ 1515 image.normal: "i-"_ICON; \
1530 min: 15 15; \ 1516 min: 15 15; \
1531 max: 15 15; \ 1517 max: 15 15; \
1532 fixed: 1 1; \ 1518 fixed: 1 1; \
@@ -1718,7 +1704,7 @@ group { name: "e/modules/efm_navigation/pathbar_scrollframe";
1718 scale: 1; 1704 scale: 1;
1719 description { state: "default" 0.0; 1705 description { state: "default" 0.0;
1720 rel.to: "arrow1_ev"; 1706 rel.to: "arrow1_ev";
1721 image.normal: "ic-arrow-l"; 1707 image.normal: "i-arrow-l";
1722 FIXED_SIZE(15, 15) 1708 FIXED_SIZE(15, 15)
1723 color: 160 160 160 255; 1709 color: 160 160 160 255;
1724 } 1710 }
@@ -1741,7 +1727,7 @@ group { name: "e/modules/efm_navigation/pathbar_scrollframe";
1741 scale: 1; 1727 scale: 1;
1742 description { state: "default" 0.0; 1728 description { state: "default" 0.0;
1743 rel.to: "arrow2_ev"; 1729 rel.to: "arrow2_ev";
1744 image.normal: "ic-arrow-r"; 1730 image.normal: "i-arrow-r";
1745 FIXED_SIZE(15, 15) 1731 FIXED_SIZE(15, 15)
1746 color: 160 160 160 255; 1732 color: 160 160 160 255;
1747 } 1733 }
diff --git a/data/elementary/themes/edc/icons.edc b/data/elementary/themes/edc/icons.edc
index 38388ef620..dfc7cc8baf 100644
--- a/data/elementary/themes/edc/icons.edc
+++ b/data/elementary/themes/edc/icons.edc
@@ -1,11 +1,8 @@
1#define ICON(_NAME, _SIZE, _FILE) \ 1#define ICON(_NAME, _FILE) \
2 group { \ 2 group { name: "e/icons/"_NAME; \
3 name: "e/icons/"_NAME; \
4 max: _SIZE _SIZE; \
5 parts { \ 3 parts { \
6 part { name: "icon"; mouse_events: 0; \ 4 part { name: "icon"; mouse_events: 0; \
7 description { state: "default" 0.0; \ 5 description { state: "default" 0.0; \
8 max: _SIZE _SIZE; \
9 aspect: 1.0 1.0; aspect_preference: BOTH; \ 6 aspect: 1.0 1.0; aspect_preference: BOTH; \
10 image.image: _FILE COMP; \ 7 image.image: _FILE COMP; \
11 image.normal: _FILE; \ 8 image.normal: _FILE; \
@@ -14,93 +11,79 @@
14 } \ 11 } \
15 } 12 }
16 13
17 ICON("system", 80, "icon_system.png") 14 ICON("system", "icon_system.png")
18 ICON("system-shutdown", 80, "icon_system-shutdown.png") 15 ICON("system-shutdown", "icon_system-shutdown.png")
19 ICON("system-restart", 80, "icon_system-restart.png") 16 ICON("system-restart", "icon_system-restart.png")
20 ICON("system-suspend", 80, "icon_system-suspend.png") 17 ICON("system-suspend", "icon_system-suspend.png")
21 ICON("system-suspend-hibernate", 80, "icon_system-suspend-hibernate.png") 18 ICON("system-suspend-hibernate", "icon_system-suspend-hibernate.png")
22 ICON("system-log-out", 80, "icon_system-log-out.png") 19 ICON("system-log-out", "icon_system-log-out.png")
23 ICON("system-lock-screen", 80, "icon_system-lock-screen.png") 20 ICON("system-lock-screen", "icon_system-lock-screen.png")
24 ICON("application-exit", 80, "icon_system-log-out.png") 21 ICON("application-exit", "icon_system-log-out.png")
25 ICON("enlightenment", 80, "icon_enlightenment.png") 22 ICON("enlightenment", "icon_enlightenment.png")
26 ICON("help-about", 80, "icon_enlightenment.png") 23 ICON("help-about", "icon_enlightenment.png")
27 ICON("preferences-desktop-environments", 80, "icon_preferences-desktop-environments.png") 24 ICON("preferences-desktop-environments", "icon_preferences-desktop-environments.png")
28 ICON("preferences-applications-screen-lock", 80, "icon_preferences-applications-screen-lock.png") 25 ICON("preferences-applications-screen-lock", "icon_preferences-applications-screen-lock.png")
29 ICON("preferences-applications-screen-unlock", 80, "icon_preferences-applications-screen-unlock.png") 26 ICON("preferences-applications-screen-unlock", "icon_preferences-applications-screen-unlock.png")
30 ICON("preferences-applications-personal", 80, "icon_preferences-applications-personal.png") 27 ICON("preferences-applications-personal", "icon_preferences-applications-personal.png")
31 ICON("preferences-desklock-locale", 80, "icon_preferences-desklock-locale.png") 28 ICON("preferences-desklock-locale", "icon_preferences-desklock-locale.png")
32 ICON("preferences-desktop-signal-bindings", 80, "icon_preferences-desktop-signal-bindings.png") 29 ICON("preferences-desktop-signal-bindings", "icon_preferences-desktop-signal-bindings.png")
33 ICON("preferences-variables", 80, "icon_preferences-variables.png") 30 ICON("preferences-variables", "icon_preferences-variables.png")
34 ICON("preferences-interaction", 80, "icon_preferences-interaction.png") 31 ICON("preferences-interaction", "icon_preferences-interaction.png")
35 ICON("preferences-composite", 80, "icon_preferences-composite.png") 32 ICON("preferences-composite", "icon_preferences-composite.png")
36 33
37 ICON("enlightenment/wallpaper_stretch", 80, "icon_wallpaper_stretch.png") 34 ICON("enlightenment/wallpaper_stretch", "icon_wallpaper_stretch.png")
38 ICON("enlightenment/wallpaper_center", 80, "icon_wallpaper_center.png") 35 ICON("enlightenment/wallpaper_center", "icon_wallpaper_center.png")
39 ICON("enlightenment/wallpaper_tile", 80, "icon_wallpaper_tile.png") 36 ICON("enlightenment/wallpaper_tile", "icon_wallpaper_tile.png")
40 ICON("enlightenment/wallpaper_scale_aspect_in", 80, "icon_wallpaper_within.png") 37 ICON("enlightenment/wallpaper_scale_aspect_in", "icon_wallpaper_within.png")
41 ICON("enlightenment/wallpaper_scale_aspect_out", 80, "icon_wallpaper_fill.png") 38 ICON("enlightenment/wallpaper_scale_aspect_out", "icon_wallpaper_fill.png")
42 ICON("enlightenment/wallpaper_pan", 80, "icon_wallpaper_pan.png") 39 ICON("enlightenment/wallpaper_pan", "icon_wallpaper_pan.png")
43#if 0
44// ICON("", 80, "")
45#endif
46#undef ICON 40#undef ICON
47 41
48// regular icons 42// regular icons
49#define ICON(_NAME, _FILE) \ 43#define ICON(_NAME, _ICON) \
50 set { name: _FILE"_icon"; \ 44 group { name: "e/icons/"_NAME; \
51 image { image: _FILE"_160.png" COMP; size: 81 81 16000 16000; } \
52 image { image: _FILE"_080.png" COMP; size: 41 41 80 80; } \
53 image { image: _FILE"_040.png" COMP; size: 0 0 40 40; } \
54 } \
55 group { \
56 name: "e/icons/"_NAME; \
57 max: 16000 16000; \
58 parts { \ 45 parts { \
59 part { name: "icon"; mouse_events: 0; \ 46 part { name: "icon"; mouse_events: 0; \
60 description { state: "default" 0.0; \ 47 description { state: "default" 0.0; \
61 aspect: 1.0 1.0; aspect_preference: BOTH; \ 48 aspect: 1.0 1.0; aspect_preference: BOTH; \
62 image.normal: _FILE"_icon"; \ 49 image.normal: _ICON; \
63 } \ 50 } \
64 } \ 51 } \
65 } \ 52 } \
66 } 53 }
67 ICON("modules-files", "efm_folder")
68 ICON("system-file-manager", "efm_folder")
69 ICON("folder", "efm_folder")
70 ICON("folder-image", "efm_folder")
71 ICON("inode/directory", "efm_folder")
72 ICON("user-home", "efm_home")
73 ICON("user-desktop", "efm_desktop")
74 ICON("user-temp", "efm_temp")
75 ICON("user-bookmarks", "efm_favorite")
76 ICON("computer", "efm_computer")
77 ICON("drive-optical", "efm_drive_cd")
78 ICON("drive-harddisk", "efm_drive_hdd")
79 ICON("drive-removable-media", "efm_drive_usb_media")
80 ICON("media-flash", "efm_drive_flash")
81 54
82 ICON("dialog-ask", "ic_unknown") 55 ICON("modules-files", "i-folder")
83 ICON("unknown", "ic_unknown") 56 ICON("system-file-manager", "i-folder")
84 ICON("emblem-symbolic-link", "ic_unknown") 57 ICON("folder", "i-folder")
58 ICON("folder-image", "i-folder")
59 ICON("inode/directory", "i-folder")
60 ICON("user-home", "i-home")
61 ICON("user-desktop", "i-desktop")
62 ICON("user-temp", "i-temp")
63 ICON("user-bookmarks", "i-favorite")
64 ICON("computer", "i-computer")
65 ICON("drive-optical", "i-drive-cd")
66 ICON("drive-harddisk", "i-drive-hdd")
67 ICON("drive-removable-media", "i-drive-usb-media")
68 ICON("media-flash", "i-drive-flash")
69
70 ICON("dialog-ask", "i-unknown")
71 ICON("unknown", "i-unknown")
72 ICON("emblem-symbolic-link", "i-unknown")
85#undef ICON 73#undef ICON
74
86// mime icons 75// mime icons
87#define ICON(_NAME, _FILE) \ 76#define ICON(_NAME, _ICON) \
88 set { name: _FILE"_icon"; \ 77 group { name: "e/icons/fileman/mime/"_NAME; \
89 image { image: _FILE"_160.png" COMP; size: 81 81 16000 16000; } \
90 image { image: _FILE"_080.png" COMP; size: 41 41 80 80; } \
91 image { image: _FILE"_040.png" COMP; size: 0 0 40 40; } \
92 } \
93 group { \
94 name: "e/icons/fileman/mime/"_NAME; \
95 max: 16000 16000; \
96 parts { \ 78 parts { \
97 part { name: "icon"; mouse_events: 0; \ 79 part { name: "icon"; mouse_events: 0; \
98 description { state: "default" 0.0; \ 80 description { state: "default" 0.0; \
99 aspect: 1.0 1.0; aspect_preference: BOTH; \ 81 aspect: 1.0 1.0; aspect_preference: BOTH; \
100 image.normal: _FILE"_icon"; \ 82 image.normal: _ICON; \
101 } \ 83 } \
102 } \ 84 } \
103 } \ 85 } \
104 } 86 }
105 ICON("inode/directory", "efm_folder") 87
88 ICON("inode/directory", "i-folder")
106#undef ICON 89#undef ICON
diff --git a/data/elementary/themes/edc/start.edc b/data/elementary/themes/edc/start.edc
index 679c44fe06..f14e6c109f 100644
--- a/data/elementary/themes/edc/start.edc
+++ b/data/elementary/themes/edc/start.edc
@@ -1,10 +1,5 @@
1group { name: "e/modules/start/main"; 1group { name: "e/modules/start/main";
2 alias: "e/gadget/start/main"; 2 alias: "e/gadget/start/main";
3 images.image: "big_arrow_down.png" COMP;
4 images.image: "big_arrow_up.png" COMP;
5 images.image: "big_arrow_left.png" COMP;
6 images.image: "big_arrow_right.png" COMP;
7 max: 128 128;
8 parts { 3 parts {
9 part { name: "arrow_base"; type: RECT; 4 part { name: "arrow_base"; type: RECT;
10 description { state: "default" 0.0; 5 description { state: "default" 0.0;
@@ -20,28 +15,22 @@ group { name: "e/modules/start/main";
20 part { name: "arrow"; 15 part { name: "arrow";
21 clip_to: "arrow_base"; 16 clip_to: "arrow_base";
22 description { state: "default" 0.0; 17 description { state: "default" 0.0;
23 image.normal: "big_arrow_up.png"; 18 image.normal: "i-arrow-u";
24 aspect: (17/14) (17/14);
25 max: 17 14;
26 color: 160 160 160 255; 19 color: 160 160 160 255;
20 rel1.relative: (4/40) (4/40);
21 rel2.relative: (36/40) (36/40);
27 } 22 }
28 description { state: "down" 0.0; 23 description { state: "down" 0.0;
29 inherit: "default" 0.0; 24 inherit: "default" 0.0;
30 image.normal: "big_arrow_down.png"; 25 image.normal: "i-arrow-d";
31 aspect: (17/14) (17/14);
32 max: 17 14;
33 } 26 }
34 description { state: "left" 0.0; 27 description { state: "left" 0.0;
35 inherit: "default" 0.0; 28 inherit: "default" 0.0;
36 image.normal: "big_arrow_left.png"; 29 image.normal: "i-arrow-l";
37 aspect: (14/17) (14/17);
38 max: 14 17;
39 } 30 }
40 description { state: "right" 0.0; 31 description { state: "right" 0.0;
41 inherit: "default" 0.0; 32 inherit: "default" 0.0;
42 image.normal: "big_arrow_right.png"; 33 image.normal: "i-arrow-r";
43 aspect: (14/17) (14/17);
44 max: 14 17;
45 } 34 }
46 } 35 }
47 part { name: "events"; type: RECT; 36 part { name: "events"; type: RECT;
@@ -51,15 +40,11 @@ group { name: "e/modules/start/main";
51 } 40 }
52 } 41 }
53 programs { 42 programs {
54 program { 43 program { signal: "e,state,focused"; source: "e";
55 signal: "e,state,focused";
56 source: "e";
57 action: STATE_SET "active" 0.0; 44 action: STATE_SET "active" 0.0;
58 target: "arrow_base"; 45 target: "arrow_base";
59 } 46 }
60 program { 47 program { signal: "e,state,unfocused"; source: "e";
61 signal: "e,state,unfocused";
62 source: "e";
63 action: STATE_SET "default" 0.0; 48 action: STATE_SET "default" 0.0;
64 target: "arrow_base"; 49 target: "arrow_base";
65 } 50 }
diff --git a/data/elementary/themes/ic.edc b/data/elementary/themes/ic.edc
new file mode 100644
index 0000000000..e432c3466d
--- /dev/null
+++ b/data/elementary/themes/ic.edc
@@ -0,0 +1,831 @@
1// master file defining all the icon images and image sets for multiple
2// sizes to use optimal memory or decode less
3///////////////////////////////////////////////////////////////////////////////
4// larger icons
5// 160, 80, 40
6#define I160(_NAME, _FILE) \
7 set { name: _NAME""; \
8 image { image: "ic/"_FILE"-160.png" COMP; size: 81 81 16000 16000; } \
9 image { image: "ic/"_FILE"-080.png" COMP; size: 41 41 80 80; } \
10 image { image: "ic/"_FILE"-040.png" COMP; size: 0 0 40 40; } \
11 }
12// smaller icons
13// 60, 30, 15
14#define I060(_NAME, _FILE) \
15 set { name: _NAME; \
16 image { image: "ic/"_FILE"-060.png" COMP; size: 31 31 60000 60000; } \
17 image { image: "ic/"_FILE"-030.png" COMP; size: 16 16 30 30; } \
18 image { image: "ic/"_FILE"-015.png" COMP; size: 0 0 15 15; } \
19 }
20
21///////////////////////////////////////////////////////////////////////////////
22// smaller monocrhome icons
23I060("i-arrow-l", "arrow-l")
24I060("i-arrow-r", "arrow-r")
25I060("i-arrow-u", "arrow-u")
26I060("i-arrow-d", "arrow-d")
27I060("i-reload", "reload")
28I060("i-heart", "heart")
29I060("i-close", "close")
30// close
31// lock
32// lock double
33// unlocked
34// exclam
35// apps
36// everything
37// screenshot
38// camera
39// folder
40// desktop
41// windows
42// enlightenment
43// spanner
44// system
45// border
46// kill
47// maximize
48// minimize
49// more
50// move
51// pager
52// pin
53// properties
54// remember
55// resize
56// send to
57// shaded
58// skip
59// stack bottom
60// stack norm
61// stack top
62// chat
63// check
64// clock
65// delete
66// edit
67// eject
68// file
69// ff
70// rw
71// next
72// prev
73// stop
74// play
75// pause
76// head
77// info
78// mute
79// sound/volume
80// search
81// pair
82// unpair
83// auto lock
84// no lock
85// auto connect
86// manual connect
87// connect
88// disconnect
89// trust
90// untrust
91// pair
92// unpair
93// more
94// cancel
95// sys lock
96// sys halt
97// sys reboot
98// sys suspend
99// sys hibernate
100// sys lgout
101// system
102// center
103// fill
104// pan
105// stretch
106// tile
107// fit inside
108// warning
109// keyboard
110// mouse
111// touch
112// upload
113// download
114// up+download
115// battery
116// power
117// network
118// ethernet
119// bt
120// wifi
121// temp
122// tile float
123// tile h
124// tile v
125// package
126// bug
127// enhance
128// pri low
129// pri med
130// pri hi
131// hand
132// pointer
133// plus
134// minus
135// ban
136// screen
137// op ask
138// op copy
139// op move
140// rocket
141// kbd+mouse
142// palette
143// font
144// top
145// bottom
146// left
147// right
148// top left
149// top center
150// top right
151// bottom left
152// bottom center
153// bottom right
154// left top
155// left center
156// left bottom
157// right top
158// right center
159// right bottom
160// question
161// key
162// moon
163// paintbrush
164// chip
165// mic
166// bulb
167// bright bulb
168// phone
169
170///////////////////////////////////////////////////////////////////////////////
171// larger color icons (mostly efm or settings)
172I160("i-computer", "efm-computer")
173I160("i-desktop", "efm-desktop")
174I160("i-drive-cd", "efm-drive-cd")
175I160("i-drive-flash", "efm-drive-flash")
176I160("i-drive-hdd", "efm-drive-hdd")
177I160("i-drive-usb-media", "efm-drive-usb-media")
178I160("i-favorite", "efm-favorite")
179I160("i-folder", "efm-folder")
180I160("i-home", "efm-home")
181I160("i-temp", "efm-temp")
182
183I160("i-system-shutdown", "system-shutdown")
184I160("i-system-suspend", "system-suspend")
185
186///////////////////////////////////////////////////////////////////////////////
187// misc larger icons
188I160("i-unknown", "unknown")
189
190
191
192
193
194
195
196
197
198// need to do
199#if 0
200# define ICON(NAME, FILE, SIZE) \
201 group { name: "e/icons/"NAME ; \
202 max: SIZE SIZE; \
203 parts { \
204 part { name: "icon"; repeat_events: 1; \
205 description { state: "default" 0.0; \
206 aspect: 1.0 1.0; aspect_preference: BOTH; \
207 image.image: "O/"FILE COMP; \
208 image.normal: "O/"FILE ; \
209 } \
210 } \
211 } \
212 }
213# define ICONMIME(NAME, FILE, SIZE) ICON("mimetypes/"NAME, FILE, SIZE)
214 ICON("list-add","icon_add.png",64) // "widget/add"
215 ICON("list-remove","icon_del.png",64) // "widget/del"
216 ICON("go-up","icon_up_arrow.png",64) // "widget/up_arrow" "widget/up_dir"
217 ICON("go-down","icon_down_arrow.png",64) // "widget/down_arrow"
218 ICON("go-next","icon_right_arrow.png",64) // "widget/new_dialog"
219 ICON("go-previous","icon_left_arrow.png",64) // none
220 ICON("bookmark-new","icon_add_fav.png",64) // "widget/add_fav"
221 ICON("edit-swap","icon_swap.png",64) // *** // "widget/swap"
222 ICON("edit-copy","icon_efm_copy.png",16) // EFMBUTTON("copy"
223 ICON("edit-cut","icon_efm_cut.png",16) // EFMBUTTON("cut"
224 ICON("edit-paste","icon_efm_paste.png",16) // EFMBUTTON("paste"
225 ICON("edit-delete","icon_efm_delete.png",16) // EFMBUTTON("delete"
226 ICON("edit-rename","icon_efm_rename.png",16) // EFMBUTTON("rename"
227 ICON("edit-select-all","icon_efm_select.png",16) // EFMBUTTON("select"
228 ICON("document-open","icon_efm_open.png",16) // "widget/open" EFMBUTTON("open") EFMBUTTON("new")
229 ICON("document-new","icon_new.png",64) // "widget/new"
230 ICON("document-properties","icon_efm_properties.png",16) // EFMBUTTON("properties"
231 ICON("folder-new","icon_efm_new_dir.png",16) // EFMBUTTON("new_dir"
232 ICON("view-sort","icon_efm_sort.png",16) // *** // EFMBUTTON("sort",
233 ICON("view-order","icon_efm_sort.png",16) // *** // EFMBUTTON("ordering"
234 ICON("view-hidden-files","icon_efm_view.png",16) // *** // EFMBUTTON("hidden_files"
235 ICON("configure","icon_config.png",64) // "widget/config"
236 ICON("system-run","icon_run.png",64) // "enlightenment/run"
237 ICON("window-close","icon_close.png",64) // "widget/close"
238 ICON("dialog-ok-apply","icon_check.png",64) // "enlightenment/check"
239 ICON("transform-scale","icon_resize.png",64) // "widget/resize"
240 ICON("transform-move","icon_autoscroll.png",64) // "enlightenment/autoscroll"
241 ICON("view-refresh","icon_reset.png",16) // EFMBUTTON("refresh"
242 ICON("view-inherit","icon_dummy.png",64) // *** // EFMBUTTON("inherit"
243 ICON("screenshot","icon_screenshot.png",64) // dunno
244 ICON("dialog-warning","icon_warning.png",128) // "enlightenment/warning"
245 ICON("dialog-error","icon_warning.png",128) // "enlightenment/error"
246 ICON("preferences-desktop","icon_desktops.png",64) // "enlightenment/desktops"
247 ICON("preferences-desktop-theme","icon_theme.png",64) // "enlightenment/themes"
248 ICON("preferences-desktop-wallpaper","icon_wallpaper.png",64) // "enlightenment/background"
249 ICON("preferences-desktop-color","icon_colors.png",64) // "enlightenment/colors"
250 ICON("preferences-desktop-font","icon_fonts.png",64) // "enlightenment/fonts"
251 ICON("preferences-desktop-screensaver","icon_screensaver.png",64) // "enlightenment/screensaver"
252 ICON("preferences-desktop-display","icon_screen_setup.png",64) // "enlightenment/screen_setup"
253 ICON("preferences-desktop-keyboard","icon_keyboard.png",64) // "enlightenment/keys"
254 ICON("preferences-desktop-keyboard-shortcuts","icon_keys.png",64) // "enlightenment/keys"
255 ICON("preferences-desktop-pointer","icon_mouse.png",64) // *** // "enlightenment/mouse"
256 ICON("preferences-desktop-mouse","icon_mouse_clean.png",64) // "enlightenment/mouse_clean"
257 ICON("preferences-desktop-mouse-left","icon_mouse_left.png",64) // *** // "enlightenment/mouse_left"
258 ICON("preferences-desktop-mouse-right","icon_mouse_right.png",64) // *** // "enlightenment/mouse_right"
259 ICON("preferences-desktop-mouse-middle","icon_mouse_middle.png",64) // *** // "enlightenment/mouse_middle"
260 ICON("preferences-desktop-mouse-wheel","icon_mouse_wheel.png",64) // *** // "enlightenment/mouse_wheel"
261 ICON("preferences-desktop-mouse-extra","icon_mouse_extra.png",64) // *** // "enlightenment/mouse_extra"
262 ICON("preferences-desktop-locale","icon_intl.png",64) // "enlightenment/intl"
263 ICON("preferences-desktop-mixer","icon_mixer.png",64) // "enlightenment/mixer"
264 ICON("preferences-desktop-shelf","icon_shelf.png",64) // *** // "enlightenment/shelf"
265 ICON("preferences-desktop-shelf-bottom-desk","icon_shelf_bottom_desk.png",64)// *** // "enlightenment/shelf_bottom_desk"
266 ICON("preferences-desktop-shelf-custom","icon_shelf_custom.png",64) // *** // "enlightenment/shelf_custom"
267 ICON("preferences-desktop-shelf-dock","icon_shelf_dock.png",64) // *** // "enlightenment/shelf_dock"
268 ICON("preferences-desktop-shelf-menu-bar","icon_shelf_menu_bar.png",64) // *** // "enlightenment/shelf_menu_bar"
269 ICON("preferences-desktop-shelf-panel","icon_shelf_panel.png",64) // *** // "enlightenment/shelf_panel"
270 ICON("preferences-desktop-shelf-top-desk","icon_shelf_top_desk.png",64) // *** // "enlightenment/shelf_top_desk"
271 ICON("preferences-desktop-window-remember","icon_window_remembers.png",64) // *** // "enlightenment/window_remembers"
272 ICON("preferences-position-bottom","icon_shelf_bottom.png",64) // *** // "enlightenment/shelf_position_bottom"
273 ICON("preferences-position-bottom-left","icon_shelf_bottom_left.png",64) // *** // "enlightenment/shelf_position_bottom_left"
274 ICON("preferences-position-bottom-right","icon_shelf_bottom_right.png",64) // *** // "enlightenment/shelf_position_bottom_right"
275 ICON("preferences-position-top","icon_shelf_top.png",64) // *** // "enlightenment/shelf_position_top"
276 ICON("preferences-position-top-left","icon_shelf_top_left.png",64) // *** // "enlightenment/shelf_position_top_left"
277 ICON("preferences-position-top-right","icon_shelf_top_right.png",64) // *** // "enlightenment/shelf_position_top_right"
278 ICON("preferences-position-left","icon_shelf_left.png",64) // *** // "enlightenment/shelf_position_left"
279 ICON("preferences-position-left-top","icon_shelf_left_top.png",64) // *** // "enlightenment/shelf_position_left_top"
280 ICON("preferences-position-left-bottom","icon_shelf_left_bottom.png",64) // *** // "enlightenment/shelf_position_left_bottom"
281 ICON("preferences-position-right","icon_shelf_right.png",64) // *** // "enlightenment/shelf_position_right"
282 ICON("preferences-position-right-top","icon_shelf_right_top.png",64) // *** // "enlightenment/shelf_position_right_top"
283 ICON("preferences-position-right-bottom","icon_shelf_right_bottom.png",64) // *** // "enlightenment/shelf_position_right_bottom"
284 ICON("preferences-window-process","icon_window_process_management.png",64) // *** // "enlightenment/window_process"
285 ICON("preferences-window-manipulation","icon_window_manipulation.png",64) // *** // "enlightenment/window_manipulation"
286 ICON("preferences-window-maximize","icon_window_manipulation.png",64) // *** // "enlightenment/window_maximize"
287 ICON("preferences-window-stacking","icon_winlist.png",64) // *** // "enlightenment/window_stacking"
288 ICON("preferences-window-geometry","icon_window_geometry.png",64) // *** // "enlightenment/window_geometry"
289 ICON("preferences-windows-lost","icon_lost_windows.png",64) // *** // "enlightenment/lost_windows"
290 ICON("preferences-gradient","icon_gradient.png",64) // *** // "enlightenment/gradient"
291 ICON("preferences-focus","icon_window_focus.png",64) // *** // "enlightenment/focus"
292 ICON("preferences-engine","icon_engine.png",64) // *** // "enlightenment/engine"
293 ICON("preferences-dialogs","icon_dummy.png",64) // *** // "enlightenment/dialogs"
294 ICON("preferences-imc","icon_imc.png",64) // *** // "enlightenment/imc"
295 ICON("preferences-system-lock-screen","icon_desklock.png",64) // *** // "enlightenment/desklock"
296 ICON("preferences-icon-theme","icon_icon_theme.png",64) // *** // "enlightenment/icon_theme"
297 ICON("preferences-transitions","icon_transitions.png",64) // *** // "enlightenment/transitions"
298 ICON("preferences-desktop-edge-bindings","icon_shelf_right.png",64) // *** // "enlightenment/edges"
299 ICON("preferences-toolbar","icon_toolbar.png",64) // *** // "enlightenment/toolbar"
300 ICON("preferences-profiles","icon_profiles.png",64) // *** // "enlightenment/profiles"
301 ICON("preferences-startup","icon_startup.png",64) // *** // "enlightenment/startup"
302 ICON("preferences-winlist","icon_winlist.png",64) // *** // "enlightenment/winlist"
303 ICON("preferences-menus","icon_menus.png",64) // *** // "enlightenment/menus"
304 ICON("preferences-menu-settings","icon_menu_settings.png",64) // *** // "enlightenment/menu_settings"
305 ICON("preferences-advanced","icon_advanced.png",64) // *** // "enlightenment/advanced"
306 ICON("preferences-behavior","icon_behavior.png",64) // *** // "enlightenment/behavior"
307 ICON("preferences-look","icon_look.png",64) // *** // "enlightenment/look"
308 ICON("preferences-utils","icon_gadget.png",64) // *** // "enlightenment/utils"
309 ICON("preferences-extensions","icon_extensions.png",64) // *** // "enlightenment/extensions"
310 ICON("preferences-file-icons","icon_file_icons.png",64) // *** // "enlightenment/file_icons"
311 ICON("preferences-pager","icon_pager.png",64) // *** // "enlightenment/pager"
312 ICON("preferences-scale","icon_scale.png",64) // *** // "enlightenment/scale"
313 ICON("preferences-directories","icon_directories.png",64) // *** // "enlightenment/directories"
314 ICON("preferences-screen-normal","icon_screen_normal.png",64) // *** // "enlightenment/screen_normal"
315 ICON("preferences-screen-around","icon_screen_around.png",64) // *** // "enlightenment/screen_around"
316 ICON("preferences-screen-left","icon_screen_left.png",64) // *** // "enlightenment/screen_left"
317 ICON("preferences-screen-right","icon_screen_right.png",64) // *** // "enlightenment/screen_right"
318 ICON("preferences-screen-vflip","icon_screen_vflip.png",64) // *** // "enlightenment/screen_vflip"
319 ICON("preferences-screen-hflip","icon_screen_hflip.png",64) // *** // "enlightenment/screen_hflip"
320 ICON("preferences-applications","icon_applications.png",64) // *** // "enlightenment/applications"
321 ICON("preferences-applications-add","icon_applications_new.png",64) // *** // "enlightenment/add_application"
322 ICON("preferences-applications-ibar","icon_applications_ibar.png",64) // *** // "enlightenment/ibar_applications"
323 ICON("preferences-applications-restart","icon_applications_restart.png",64) // *** // "enlightenment/restart_applications"
324 ICON("preferences-applications-startup","icon_applications_startup.png",64) // *** // "enlightenment/startup_applications"
325 ICON("preferences-desktop-default-applications","icon_advanced.png",64)
326 ICON("preferences-preferences","icon_config.png",64) // "enlightenment/configuration" "enlightenment/settings"
327 ICON("preferences-plugin","icon_modules.png",64) // "enlightenment/modules"
328 ICON("preferences-system","icon_configuration.png",64) // "enlightenment/configuration" "enlightenment/settings"
329 ICON("preferences-system-windows","icon_windows.png",64) // "enlightenment/windows" "enlightenment/showhide"
330 ICON("preferences-system-performance","icon_performance.png",64) // "enlightenment/performance"
331 ICON("preferences-system-power-management","icon_power_management.png",64) // "enlightenment/power_management"
332 ICON("preferences-system-screen-resolution","icon_screen_resolution.png",64)// *** // "enlightenment/screen_resolution"
333 ICON("preferences-illume","icon_illume.png",64)
334// ICON("system-file-manager","icon_efm_folder.png",64) // "enlightenment/fileman"
335 ICON("modules-utils","icon_gadget.png",64)
336 ICON("modules-system","icon_gadget.png",64)
337 ICON("modules-look","icon_look.png",64)
338 ICON("modules-launcher","icon_run.png",64)
339 ICON("modules-core","logo_white_128.png",64)
340 ICON("modules-mobile","icon_globe.png",64)
341 ICON("modules-settings","icon_config.png",64)
342// ICON("emblem-symbolic-link","icon_dummy.png",64) // EFMBUTTON("symlink")
343 ICON("start-here","logo_white_128.png",128) // "enlightenment/e"
344// ICON("folder","icon_efm_folder.png",64) // "fileman/folder"
345// ICON("user-home","icon_efm_home.png",64) // "fileman/home"
346// ICON("user-temp","icon_efm_tmp.png",64) // *** // "fileman/tmp"
347// ICON("user-desktop","icon_efm_desktop.png",64) // "fileman/desktop"
348// ICON("user-bookmarks","icon_favorites.png",64) // "enlightenment/favorites"
349// ICON("folder-image","icon_wallpaper.png",64) // "enlightenment/picture"
350 ICON("network-website","icon_globe.png",64) // "enlightenment/website"
351// ICON("computer","icon_efm_root.png", 64) // "fileman/root"
352// ICON("drive-harddisk","icon_efm_hdd.png", 128) // "fileman/hd" "fileman/hdd"
353// ICON("drive-optical","icon_efm_cd.png", 128) // "fileman/??"
354// ICON("media-flash","icon_efm_flash.png", 128) // "fileman/??"
355// ICON("drive-removable-media","icon_efm_usbmedia.png", 128);
356 ICON("media-eject","icon_efm_eject.png", 64)
357 ICON("everything-launch","icon_advanced.png",64)
358 ICON("everything-clipboard","icon_evry_clipboard.png", 256)
359
360 ICONMIME("inode/chardevice","icon_efm_file.png",128)
361 ICONMIME("inode/blockdevice","icon_efm_file.png",128)
362 ICONMIME("inode/directory-locked","icon_efm_file.png",128)
363 ICONMIME("inode/directory","icon_efm_folder.png",128)
364 ICONMIME("inode/fifo","icon_efm_file.png",128)
365 ICONMIME("inode/socket","icon_efm_file.png",128)
366
367#define EFM_MIME_ICON(_NAME, _IMAGE, _ASPMIN, _ASPMAX, _STRING, _SIZE, _VALIGN) \
368 group { name: "e/icons/fileman/mime/"_NAME; \
369 max: _SIZE _SIZE; \
370 images.image: "efm_generic_icon_shadow.png" COMP; \
371 images.image: "efm_generic_icon_base.png" COMP; \
372 images.image: "efm_generic_icon_over.png" COMP; \
373 images.image: _IMAGE COMP; \
374 parts { \
375 part { name: "spacer"; type: SPACER; \
376 description { state: "default" 0.0; \
377 aspect: 1.0 1.0; aspect_preference: BOTH; \
378 } \
379 } \
380 part { name: "shadow"; mouse_events: 0; \
381 description { state: "default" 0.0; \
382 rel1.to: "spacer"; \
383 rel1.relative: (15/240) (10/240); \
384 rel2.to: "spacer"; \
385 rel2.relative: (225/240) (240/240); \
386 image.normal: "efm_generic_icon_shadow.png"; \
387 } \
388 } \
389 part { name: "base"; mouse_events: 0; \
390 description { state: "default" 0.0; \
391 rel1.to: "spacer"; \
392 rel1.relative: (30/240) (15/240); \
393 rel2.to: "spacer"; \
394 rel2.relative: (210/240) (225/240); \
395 image.normal: "efm_generic_icon_base.png"; \
396 } \
397 } \
398 part { name: "content"; mouse_events: 0; \
399 description { state: "default" 0.0; \
400 rel1.to: "base"; \
401 rel1.relative: (28/180) (28/210); \
402 rel2.to: "base"; \
403 rel2.relative: (152/180) (182/210); \
404 align: 0.5 _VALIGN; \
405 aspect: _ASPMIN _ASPMAX; aspect_preference: BOTH; \
406 image.normal: _IMAGE; \
407 } \
408 } \
409 part { name: "over"; mouse_events: 0; \
410 description { state: "default" 0.0; \
411 rel1.to: "base"; \
412 rel2.to: "base"; \
413 image.normal: "efm_generic_icon_over.png"; \
414 } \
415 } \
416 part { name: "typestr"; type: TEXT; mouse_events: 0; \
417 description { state: "default" 0.0; \
418 rel1.to: "over"; \
419 rel1.relative: (72/180) (142/210); \
420 rel2.to: "over"; \
421 rel2.relative: (178/180) (188/210); \
422 color: 255 255 255 255; \
423 text { font: FN; size: 8; \
424 fit: 0 1; \
425 align: 0.5 0.5; \
426 text: _STRING; \
427 } \
428 } \
429 } \
430 } \
431 }
432//Python//
433
434 EFM_MIME_ICON("application/x-python-bytecode", "efm_generic_icon_content_python.png", (114/115), (114/115), ".PYC", 240, 0.5);
435 EFM_MIME_ICON("application/x-python", "efm_generic_icon_content_python.png", (114/115), (114/115), ".PY", 240, 0.5);
436 EFM_MIME_ICON("text/x-python", "efm_generic_icon_content_python.png", (114/115), (114/115), ".PY", 240, 0.5);
437
438 //.pyo .pyd??????????????????//
439
440//Ruby//
441
442 EFM_MIME_ICON("application/x-ruby", "efm_generic_icon_content_ruby.png", (114/114), (114/114), ".RB", 240, 0.5);
443 EFM_MIME_ICON("text/x-ruby", "efm_generic_icon_content_ruby.png", (114/114), (114/114), ".RB", 240, 0.5);
444
445 //.rbw???//
446
447//Perl//
448
449 EFM_MIME_ICON("application/x-perl", "efm_generic_icon_content_perl.png", (114/122), (114/122), ".PERL", 240, 0.5);
450 EFM_MIME_ICON("text/x-perl","efm_generic_icon_content_perl.png", (114/122), (114/122), ".PL", 240, 0.5);
451
452//CAD//
453
454 EFM_MIME_ICON("application/acad", "efm_generic_icon_content_cad.png", (114/130), (114/130), ".DWG", 240, 0.5);
455 EFM_MIME_ICON("application/x-acad", "efm_generic_icon_content_cad.png", (114/130), (114/130), ".DWG", 240, 0.5);
456 EFM_MIME_ICON("application/autocad_dwg", "efm_generic_icon_content_cad.png", (114/130), (114/130), ".DWG", 240, 0.5);
457 EFM_MIME_ICON("image/x-dwg", "efm_generic_icon_content_cad.png", (114/130), (114/130), ".DWG", 240, 0.5);
458 EFM_MIME_ICON("application/dwg", "efm_generic_icon_content_cad.png", (114/130), (114/130), ".DWG", 240, 0.5);
459 EFM_MIME_ICON("application/x-dwg", "efm_generic_icon_content_cad.png", (114/130), (114/130), ".DWG", 240, 0.5);
460 EFM_MIME_ICON("application/x-autocad", "efm_generic_icon_content_cad.png", (114/130), (114/130), ".DWG", 240, 0.5);
461 EFM_MIME_ICON("image/vnd.dwg", "efm_generic_icon_content_cad.png", (114/130), (114/130), ".DWG", 240, 0.5);
462 EFM_MIME_ICON("drawing/dwg", "efm_generic_icon_content_cad.png", (114/130), (114/130), ".DWG", 240, 0.5);
463
464//ISO//
465
466 EFM_MIME_ICON("application/x-iso9660-image", "efm_generic_icon_content_iso.png", (114/114), (114/114), ".ISO", 240, 0.5);
467
468//Cue//
469
470 EFM_MIME_ICON("application/x-cue", "efm_generic_icon_content_iso.png", (114/114), (114/114), ".CUE", 240, 0.5);
471
472//Audio//
473
474 EFM_MIME_ICON("audio/mpeg", "efm_generic_icon_content_audio.png", (54/154), (54/154), ".MP3", 240, 0.5);
475 EFM_MIME_ICON("audio/x-wav","efm_generic_icon_content_audio.png", (54/154), (54/154), ".WAV", 240, 0.5);
476 EFM_MIME_ICON("audio/x-flac","efm_generic_icon_content_audio.png", (54/154), (54/154), ".FLAC", 240, 0.5);
477 EFM_MIME_ICON("audio/flac","efm_generic_icon_content_audio.png", (54/154), (54/154), ".FLAC", 240, 0.5);
478 EFM_MIME_ICON("audio/x-musepack","efm_generic_icon_content_audio.png", (54/154), (54/154), ".MPC", 240, 0.5);
479 EFM_MIME_ICON("audio/x-vorbis+ogg","efm_generic_icon_content_audio.png",(54/154), (54/154), ".OGG", 240, 0.5);
480 EFM_MIME_ICON("application/x-audacity-project","efm_generic_icon_content_audio.png",(54/154), (54/154), ".AUP", 240, 0.5);
481 EFM_MIME_ICON("audio/x-ms-wma","efm_generic_icon_content_audio.png", (54/154), (54/154),".WMA", 240, 0.5);
482 EFM_MIME_ICON("audio/opus","efm_generic_icon_content_audio.png", (54/154), (54/154),".OPUS", 240, 0.5);
483 EFM_MIME_ICON("audio/ogg","efm_generic_icon_content_audio.png", (54/154), (54/154),".OPUS", 240, 0.5);
484 EFM_MIME_ICON("audio/x-opus+ogg","efm_generic_icon_content_audio.png", (54/154), (54/154),".OPUS", 240, 0.5);
485 EFM_MIME_ICON("audio/ape","efm_generic_icon_content_audio.png", (54/154), (54/154), ".APE", 240, 0.5);
486 EFM_MIME_ICON("audio/webm","efm_generic_icon_content_audio.png", (54/154), (54/154), ".WEBA", 240, 0.5);
487 EFM_MIME_ICON("audio/mp4","efm_generic_icon_content_audio.png", (54/154), (54/154), ".MP4", 240, 0.5);
488 EFM_MIME_ICON("audio/midi","efm_generic_icon_content_audio.png", (54/154), (54/154),".MIDI", 240, 0.5);
489 EFM_MIME_ICON("audio/speex","efm_generic_icon_content_audio.png",(54/154), (54/154), ".SPX", 240, 0.5);
490 EFM_MIME_ICON("audio/aac","efm_generic_icon_content_audio.png", (54/154), (54/154),".AAC", 240, 0.5);
491 EFM_MIME_ICON("audio/vnd.rn-realaudio","efm_generic_icon_content_audio.png", (54/154), (54/154),".RA", 240, 0.5);
492 EFM_MIME_ICON("audio/x-voc","efm_generic_icon_content_audio.png", (54/154), (54/154),".VOC", 240, 0.5);
493 EFM_MIME_ICON("audio/x-tta","efm_generic_icon_content_audio.png", (54/154), (54/154),".TTA", 240, 0.5);
494 EFM_MIME_ICON("audio/x-stm","efm_generic_icon_content_audio.png", (54/154), (54/154),".STM", 240, 0.5);
495 EFM_MIME_ICON("audio/x-speex+ogg","efm_generic_icon_content_audio.png", (54/154), (54/154),".SPX", 240, 0.5);
496 EFM_MIME_ICON("audio/x-wacpack","efm_generic_icon_content_audio.png", (54/154), (54/154),".WV", 240, 0.5);
497 EFM_MIME_ICON("audio/x-xmf","efm_generic_icon_content_audio.png", (54/154), (54/154),".XMF", 240, 0.5);
498 EFM_MIME_ICON("audio/x-xm","efm_generic_icon_content_audio.png", (54/154), (54/154),".XM", 240, 0.5);
499 EFM_MIME_ICON("audio/x-xi","efm_generic_icon_content_audio.png", (54/154), (54/154),".XI", 240, 0.5);
500 EFM_MIME_ICON("audio/x-wacpack-correction","efm_generic_icon_content_audio.png", (54/154), (54/154),".WVC", 240, 0.5);
501 EFM_MIME_ICON("audio/x-s3m","efm_generic_icon_content_audio.png", (54/154), (54/154),".S3M", 240, 0.5);
502 EFM_MIME_ICON("audio/x-riff","efm_generic_icon_content_audio.png", (54/154), (54/154),".RMI", 240, 0.5);
503 EFM_MIME_ICON("audio/x-psflib","efm_generic_icon_content_audio.png", (54/154), (54/154),".PSFLIB", 240, 0.5);
504 EFM_MIME_ICON("audio/x-psf","efm_generic_icon_content_audio.png", (54/154), (54/154),".PSF", 240, 0.5);
505 EFM_MIME_ICON("audio/x-scpls","efm_generic_icon_content_audio.png", (54/154), (54/154),".PLS", 240, 0.5);
506 EFM_MIME_ICON("audio/x-ms-asx","efm_generic_icon_content_audio.png", (54/154), (54/154),".ASX", 240, 0.5);
507 EFM_MIME_ICON("audio/x-mpegurl","efm_generic_icon_content_audio.png", (54/154), (54/154),".M3U", 240, 0.5);
508 EFM_MIME_ICON("audio/x-mod","efm_generic_icon_content_audio.png", (54/154), (54/154),".MOD", 240, 0.5);
509 EFM_MIME_ICON("audio/x-mo3","efm_generic_icon_content_audio.png", (54/154), (54/154),".MO3", 240, 0.5);
510 EFM_MIME_ICON("audio/x-minipsf","efm_generic_icon_content_audio.png", (54/154), (54/154),".MINIPSF", 240, 0.5);
511 EFM_MIME_ICON("audio/matroska","efm_generic_icon_content_audio.png", (54/154), (54/154),".MKV", 240, 0.5);
512 EFM_MIME_ICON("audio/x-m4b","efm_generic_icon_content_audio.png", (54/154), (54/154),".M4B", 240, 0.5);
513 EFM_MIME_ICON("audio/x-it","efm_generic_icon_content_audio.png", (54/154), (54/154),".IT", 240, 0.5);
514 EFM_MIME_ICON("audio/x-iriver-pla","efm_generic_icon_content_audio.png", (54/154), (54/154),".PLA", 240, 0.5);
515 EFM_MIME_ICON("audio/x-gsm","efm_generic_icon_content_audio.png", (54/154), (54/154),".GSM", 240, 0.5);
516 EFM_MIME_ICON("audio/x-flac+ogg","efm_generic_icon_content_audio.png",(54/154), (54/154), ".FLAC", 240, 0.5);
517 EFM_MIME_ICON("audio/x-amzxml","efm_generic_icon_content_audio.png",(54/154), (54/154), ".AMZ", 240, 0.5);
518 EFM_MIME_ICON("audio/x-aiff","efm_generic_icon_content_audio.png",(54/154), (54/154), ".AIFF", 240, 0.5);
519 EFM_MIME_ICON("audio/x-aifc","efm_generic_icon_content_audio.png",(54/154), (54/154), ".AIFC", 240, 0.5);
520 EFM_MIME_ICON("audio/x-adpcm","efm_generic_icon_content_audio.png",(54/154), (54/154), ".ADPCM", 240, 0.5);
521 EFM_MIME_ICON("audio/vdn.rn-realaudio","efm_generic_icon_content_audio.png",(54/154), (54/154), ".RA", 240, 0.5);
522 EFM_MIME_ICON("audio/vdn.dts","efm_generic_icon_content_audio.png",(54/154), (54/154), ".DTS", 240, 0.5);
523 EFM_MIME_ICON("audio/vdn.dts.hd","efm_generic_icon_content_audio.png",(54/154), (54/154), ".DTSHD", 240, 0.5);
524 EFM_MIME_ICON("audio/prs.sid","efm_generic_icon_content_audio.png",(54/154), (54/154), ".SID", 240, 0.5);
525 EFM_MIME_ICON("audio/mp2","efm_generic_icon_content_audio.png", (54/154), (54/154), ".MP2", 240, 0.5);
526 EFM_MIME_ICON("audio/basic","efm_generic_icon_content_audio.png", (54/154), (54/154), ".SND", 240, 0.5);
527 EFM_MIME_ICON("audio/annodex","efm_generic_icon_content_audio.png", (54/154), (54/154), ".AXA", 240, 0.5);
528 EFM_MIME_ICON("audio/AMR","efm_generic_icon_content_audio.png", (54/154), (54/154), ".AMR", 240, 0.5);
529 EFM_MIME_ICON("audio/amr","efm_generic_icon_content_audio.png", (54/154), (54/154), ".AMR", 240, 0.5);
530 EFM_MIME_ICON("audio/amr-wb","efm_generic_icon_content_audio.png", (54/154), (54/154), ".AWB", 240, 0.5);
531 EFM_MIME_ICON("audio/AMR-WB","efm_generic_icon_content_audio.png", (54/154), (54/154), ".AWB", 240, 0.5);
532 EFM_MIME_ICON("audio/ac3","efm_generic_icon_content_audio.png", (54/154), (54/154), ".AC3", 240, 0.5);
533
534 EFM_MIME_ICON("application/x-mpegurl","efm_generic_icon_content_audio.png", (54/154), (54/154),".M3U", 240, 0.5);
535 EFM_MIME_ICON("application/vnd.apple.mpegurl","efm_generic_icon_content_audio.png", (54/154), (54/154),".M3U", 240, 0.5);
536
537//Code//
538
539 EFM_MIME_ICON("text/x-csrc","efm_generic_icon_content_code.png", (114/88), (114/88), ".C", 240, 0.3);
540 EFM_MIME_ICON("text/x-chdr","efm_generic_icon_content_code.png", (114/88), (114/88), ".H", 240, 0.3);
541 EFM_MIME_ICON("text/x-c++hdr","efm_generic_icon_content_code.png", (114/88), (114/88), ".HH", 240, 0.3);
542 EFM_MIME_ICON("text/x-c++src","efm_generic_icon_content_code.png", (114/88), (114/88), ".C++", 240, 0.3);
543 EFM_MIME_ICON("text/x-csharp","efm_generic_icon_content_code.png", (114/88), (114/88), ".C#", 240, 0.3);
544 EFM_MIME_ICON("application/x-awk","efm_generic_icon_content_code.png", (114/88), (114/88), ".AWK", 240, 0.3);
545 EFM_MIME_ICON("text/x-hdr","efm_generic_icon_content_code.png", (114/88), (114/88), ".HPP", 240, 0.3);
546 EFM_MIME_ICON("text/x-fortran","efm_generic_icon_content_code.png", (114/88), (114/88), ".F", 240, 0.3);
547 EFM_MIME_ICON("text/x-java-source","efm_generic_icon_content_code.png", (114/88), (114/88), ".JAVA", 240, 0.3);
548
549
550 //add moreeeeeee//
551
552//Text//
553
554 EFM_MIME_ICON("text/x-patch","efm_generic_icon_content_text.png", (114/126), (114/126), ".PATCH", 240, 0.5);
555 EFM_MIME_ICON("text/plain","efm_generic_icon_content_text.png", (114/126), (114/126), ".TXT", 240, 0.5);
556 EFM_MIME_ICON("text/x-log","efm_generic_icon_content_text.png", (114/126), (114/126), ".LOG", 240, 0.5);
557 EFM_MIME_ICON("application/x-md5","efm_generic_icon_content_text.png", (114/126), (114/126), ".MD5", 240, 0.5);
558 EFM_MIME_ICON("text/x-makefile","efm_generic_icon_content_text.png", (114/126), (114/126), ".MK", 240, 0.5);
559 EFM_MIME_ICON("application/x-m4","efm_generic_icon_content_text.png", (114/126), (114/126), ".M4", 240, 0.5);
560 EFM_MIME_ICON("application/pkix-attr-cert","efm_generic_icon_content_text.png", (114/126), (114/126), ".AC", 240, 0.5);
561 EFM_MIME_ICON("text/x-subviewer","efm_generic_icon_content_text.png", (114/126), (114/126), ".SUB", 240, 0.5);
562 EFM_MIME_ICON("application/x-wais-source","efm_generic_icon_content_text.png", (114/126), (114/126), ".SRC", 240, 0.5);
563
564//Web//
565
566 EFM_MIME_ICON("text/css","efm_generic_icon_content_web.png", (114/68), (114/68), ".CSS", 240, 0.3);
567 EFM_MIME_ICON("text/html","efm_generic_icon_content_web.png", (114/68), (114/68), ".HTML", 240, 0.3);
568 EFM_MIME_ICON("application/xml","efm_generic_icon_content_web.png", (114/68), (114/68), ".XML", 240, 0.3);
569 EFM_MIME_ICON("application/javascript","efm_generic_icon_content_web.png", (114/68), (114/68), ".JS", 240, 0.3);
570 EFM_MIME_ICON("application/json","efm_generic_icon_content_web.png", (114/68), (114/68), ".JSON", 240, 0.3);
571 EFM_MIME_ICON("text/json","efm_generic_icon_content_web.png", (114/68), (114/68), ".JSON", 240, 0.3);
572
573//Enlightenment//
574
575 EFM_MIME_ICON("application/edje","efm_generic_icon_content_logo.png", (114/154), (114/154), ".EDJ", 240, 0.5);
576 EFM_MIME_ICON("text/edje","efm_generic_icon_content_logo.png", (114/154), (114/154), ".EDC", 240, 0.5);
577
578//Document//
579
580 EFM_MIME_ICON("application/vnd.oasis.opendocument.text","efm_generic_icon_content_doc.png", (114/154), (114/154), ".ODT", 240, 0.5);
581 EFM_MIME_ICON("application/x-msword","efm_generic_icon_content_doc.png", (114/154), (114/154), ".DOC", 240, 0.5);
582 EFM_MIME_ICON("application/vnd.openxmlformats-officedocument.wordprocessingml.document","efm_generic_icon_content_doc.png", (114/154), (114/154), ".DOCX", 240, 0.5);
583 EFM_MIME_ICON("application/x-abiword","efm_generic_icon_content_doc.png", (114/154), (114/154), ".ABW", 240, 0.5);
584 EFM_MIME_ICON("application/vnd.scribus","efm_generic_icon_content_doc.png", (114/154), (114/154), ".SLA", 240, 0.5);
585 EFM_MIME_ICON("application/x-lyx","efm_generic_icon_content_doc.png", (114/154), (114/154), ".LYX", 240, 0.5);
586
587//Spreadsheet//
588
589 EFM_MIME_ICON("application/vnd.oasis.opendocument.spreadsheet","efm_generic_icon_content_spread.png", (114/80), (114/80), ".ODS", 240, 0.5);
590 EFM_MIME_ICON("application/vnd.ms-excel","efm_generic_icon_content_spread.png", (114/80), (114/80), ".XLS", 240, 0.5);
591
592//Presentation//
593
594 EFM_MIME_ICON("application/vnd.ms-powerpoint","efm_generic_icon_content_pres.png", (114/95), (114/95), ".PPT", 240, 0.5);
595 EFM_MIME_ICON("application/vnd.oasis.opendocument.presentation","efm_generic_icon_content_pres.png", (114/95), (114/95), ".ODP", 240, 0.5);
596
597//Drawing//
598
599 EFM_MIME_ICON("application/x-vnd.oasis.opendocument.graphics","efm_generic_icon_content_draw.png", (114/96), (114/96), ".ODG", 240, 0.5);
600
601//Data Base//
602
603 EFM_MIME_ICON("application/vnd.ms-binder","efm_generic_icon_content_db.png", (114/128), (114/128), ".ODB", 240, 0.5);
604 EFM_MIME_ICON("application/x-sqlite3","efm_generic_icon_content_db.png", (114/128), (114/128), ".SQLITE", 240, 0.5);
605
606//Formula//
607
608 EFM_MIME_ICON("application/x-vnd.oasis.opendocument.formula","efm_generic_icon_content_formula.png", (114/85), (114/85), ".ODF", 240, 0.5);
609
610//Template//
611
612 EFM_MIME_ICON("application/vnd.openxmlformats-officedocument.wordprocessingml.template","efm_generic_icon_content_template.png", (114/130), (114/130), ".DOTX", 240, 0.5);
613 EFM_MIME_ICON("application/vnd.openxmlformats-officedocument.spreadsheetml.template","efm_generic_icon_content_template.png", (114/130), (114/130),".XLTX", 240, 0.5);
614 EFM_MIME_ICON("application/vnd.openxmlformats-officedocument.presentationml.template","efm_generic_icon_content_template.png", (114/130), (114/130),".POTX", 240, 0.5);
615 EFM_MIME_ICON("application/vnd.oasis.opendocument.chart-template","efm_generic_icon_content_template.png", (114/130), (114/130),".OTC", 240, 0.5);
616 EFM_MIME_ICON("application/vnd.oasis.opendocument.formula-template","efm_generic_icon_content_template.png", (114/130), (114/130), ".OTF", 240, 0.5);
617 EFM_MIME_ICON("application/vnd.oasis.opendocument.graphics-template","efm_generic_icon_content_template.png", (114/130), (114/130), ".OTG", 240, 0.5);
618 EFM_MIME_ICON("application/vnd.oasis.opendocument.image-template","efm_generic_icon_content_template.png", (114/130), (114/130), ".OTI", 240, 0.5);
619 EFM_MIME_ICON("application/vnd.oasis.opendocument.presentation-template","efm_generic_icon_content_template.png", (114/130), (114/130), ".OTP", 240, 0.5);
620 EFM_MIME_ICON("application/vnd.oasis.opendocument.spreadsheet-template","efm_generic_icon_content_template.png", (114/130), (114/130), ".ODS", 240, 0.5);
621 EFM_MIME_ICON("application/vnd.oasis.opendocument.text-template","efm_generic_icon_content_template.png", (114/130), (114/130), ".OTT", 240, 0.5);
622
623//Video (fallback)//
624
625 EFM_MIME_ICON("video/mpeg","efm_generic_icon_content_video.png", (114/83), (114/83), ".MPEG", 240, 0.5);
626 EFM_MIME_ICON("application/ogg","efm_generic_icon_content_video.png",(114/83), (114/83), ".OGG", 240, 0.5);
627 EFM_MIME_ICON("video/x-theora+ogg","efm_generic_icon_content_video.png",(114/83), (114/83), ".OGG", 240, 0.5);
628 EFM_MIME_ICON("video/x-msvideo","efm_generic_icon_content_video.png", (114/83), (114/83), ".AVI", 240, 0.5);
629 EFM_MIME_ICON("video/ogg","efm_generic_icon_content_video.png",(114/83), (114/83), ".OGG", 240, 0.5);
630 EFM_MIME_ICON("video/mp4","efm_generic_icon_content_video.png",(114/83), (114/83), ".MP4", 240, 0.5);
631 EFM_MIME_ICON("video/quicktime","efm_generic_icon_content_video.png",(114/83), (114/83), ".MOV", 240, 0.5);
632 EFM_MIME_ICON("video/x-matroska","efm_generic_icon_content_video.png",(114/83), (114/83), ".MKV", 240, 0.5);
633 EFM_MIME_ICON("video/x-flv","efm_generic_icon_content_video.png", (114/83), (114/83), ".FLV", 240, 0.5);
634 EFM_MIME_ICON("application/vnd.rn-realmedia","efm_generic_icon_content_video.png",(114/83), (114/83), ".REAL", 240, 0.5);
635 EFM_MIME_ICON("video/x-ms-wmv","efm_generic_icon_content_video.png",(114/83), (114/83), ".WMV", 240, 0.5);
636 EFM_MIME_ICON("video/webm","efm_generic_icon_content_video.png",(114/83), (114/83), ".WEBM", 240, 0.5);
637
638
639//Image (fallback)//
640
641 EFM_MIME_ICON("image/png","efm_generic_icon_content_image.png", (114/128), (114/128), ".PNG", 240, 0.5);
642 EFM_MIME_ICON("image/jpeg","efm_generic_icon_content_image.png", (114/128), (114/128),".JPEG", 240, 0.5);
643 EFM_MIME_ICON("image/gif","efm_generic_icon_content_image.png", (114/128), (114/128),".GIF", 240, 0.5);
644 EFM_MIME_ICON("image/bmp","efm_generic_icon_content_image.png", (114/128), (114/128),".BMP", 240, 0.5);
645 EFM_MIME_ICON("application/x-xcf","efm_generic_icon_content_image.png", (114/128), (114/128),".XCF", 240, 0.5);
646 EFM_MIME_ICON("application/x-cbz","efm_generic_icon_content_image.png", (114/128), (114/128),".CBZ", 240, 0.5);
647 EFM_MIME_ICON("application/x-cbr","efm_generic_icon_content_image.png",(114/128), (114/128), ".CBR", 240, 0.5);
648 EFM_MIME_ICON("image/webp","efm_generic_icon_content_image.png", (114/128), (114/128),".WEBP", 240, 0.5);
649
650//Font//
651
652 EFM_MIME_ICON("application/x-font-ttf","efm_generic_icon_content_font.png", (114/93), (114/93), ".TTF", 240, 0.5);
653 EFM_MIME_ICON("application/x-font-pcf","efm_generic_icon_content_font.png", (114/93), (114/93), ".PCF", 240, 0.5);
654 EFM_MIME_ICON("application/x-font-bdf","efm_generic_icon_content_font.png", (114/93), (114/93), ".BDF", 240, 0.5);
655 EFM_MIME_ICON("application/x-font-otf","efm_generic_icon_content_font.png", (114/93), (114/93), ".BDF", 240, 0.5);
656
657//PS (fallback)//
658
659 EFM_MIME_ICON("application/postscript","efm_generic_icon_content_ps.png", (114/104), (114/104), ".PS", 240, 0.5);
660
661//PDF (fallback)//
662
663 EFM_MIME_ICON("application/pdf","efm_generic_icon_content_pdf.png", (114/101), (114/101), ".PDF", 240, 0.5);
664
665//Translate//
666
667 EFM_MIME_ICON("text/x-gettext-translation","efm_generic_icon_content_translate.png", (114/97), (114/97), ".PO", 240, 0.5);
668 EFM_MIME_ICON("application/x-gettext-translation","efm_generic_icon_content_translate.png", (114/97), (114/97), ".GMO", 240, 0.5);
669
670//Base 2//
671#define EFM_MIME_ICON_SIMPLE(_NAME, _IMAGE, _ASPMIN, _ASPMAX, _SIZE, _VALIGN) \
672 group { name: "e/icons/fileman/mime/"_NAME; \
673 max: _SIZE _SIZE; \
674 images.image: "efm_generic_icon_shadow_empty.png" COMP; \
675 images.image: "efm_generic_icon_base_empty.png" COMP; \
676 images.image: "efm_generic_icon_over_empty.png" COMP; \
677 images.image: _IMAGE COMP; \
678 parts { \
679 part { name: "spacer"; type: SPACER; \
680 description { state: "default" 0.0; \
681 aspect: 1.0 1.0; aspect_preference: BOTH; \
682 } \
683 } \
684 part { name: "shadow"; mouse_events: 0; \
685 description { state: "default" 0.0; \
686 rel1.to: "spacer"; \
687 rel1.relative: (15/240) (10/240); \
688 rel2.to: "spacer"; \
689 rel2.relative: (225/240) (240/240); \
690 image.normal: "efm_generic_icon_shadow_empty.png"; \
691 } \
692 } \
693 part { name: "base"; mouse_events: 0; \
694 description { state: "default" 0.0; \
695 rel1.to: "spacer"; \
696 rel1.relative: (30/240) (15/240); \
697 rel2.to: "spacer"; \
698 rel2.relative: (210/240) (225/240); \
699 image.normal: "efm_generic_icon_base_empty.png"; \
700 } \
701 } \
702 part { name: "content"; mouse_events: 0; \
703 description { state: "default" 0.0; \
704 rel1.to: "base"; \
705 rel1.relative: (28/180) (28/210); \
706 rel2.to: "base"; \
707 rel2.relative: (152/180) (182/210); \
708 align: 0.5 _VALIGN; \
709 aspect: _ASPMIN _ASPMAX; aspect_preference: BOTH; \
710 image.normal: _IMAGE; \
711 } \
712 } \
713 part { name: "over"; mouse_events: 0; \
714 description { state: "default" 0.0; \
715 rel1.to: "base"; \
716 rel2.to: "base"; \
717 image.normal: "efm_generic_icon_over_empty.png"; \
718 } \
719 } \
720 } \
721 }
722
723//Script//
724
725 EFM_MIME_ICON_SIMPLE("application/x-shellscript","efm_generic_icon_content_script.png", (114/126), (114/126), 240, 0.5);
726
727//Executable//
728
729 EFM_MIME_ICON_SIMPLE("application/x-executable","efm_generic_icon_content_executable.png", (114/114), (114/114), 240, 0.5);
730 EFM_MIME_ICON_SIMPLE("application/x-ms-dos-executable","efm_generic_icon_content_executable.png", (114/114), (114/114), 240, 0.5);
731
732//Libraries//
733
734 EFM_MIME_ICON_SIMPLE("application/x-sharedlib","efm_generic_icon_content_lib.png", (114/114), (114/114), 240, 0.5);
735 EFM_MIME_ICON_SIMPLE("application/x-shared-library-la","efm_generic_icon_content_lib.png", (114/114), (114/114), 240, 0.5);
736
737//Unknown//
738
739 EFM_MIME_ICON_SIMPLE("application/x-object","efm_generic_icon_content_unknown.png", (100/154), (100/154), 240, 0.5);
740
741//Trash//
742
743 EFM_MIME_ICON_SIMPLE("application/x-trash","efm_generic_icon_content_trash.png", (114/142), (114/142), 240, 0.5);
744
745//Octet-Stream//
746
747 EFM_MIME_ICON_SIMPLE("application/octet-stream","efm_generic_icon_content_text.png",(114/126), (114/126), 240, 0.5);
748
749//Install//
750
751 EFM_MIME_ICON_SIMPLE("application/x-install-instructions","efm_generic_icon_content_install.png",(114/149), (114/149), 240, 0.5);
752
753//Cache//
754
755 EFM_MIME_ICON_SIMPLE("chemical/x-cache","efm_generic_icon_content_db.png", (114/128), (114/128), 240, 0.5);
756
757//Inode//
758
759 EFM_MIME_ICON_SIMPLE("inode/chardevice","efm_generic_icon_content_inode_char.png", (114/77), (114/77), 240, 0.5);
760 EFM_MIME_ICON_SIMPLE("inode/blockdevice","efm_generic_icon_content_inode_block.png", (81/114), (81/114), 240, 0.5);
761 EFM_MIME_ICON_SIMPLE("inode/fifo","efm_generic_icon_content_inode_fifo.png", (87/114), (87/114), 240, 0.5);
762 EFM_MIME_ICON_SIMPLE("inode/socket","efm_generic_icon_content_inode_socket.png", (114/114), (114/114), 240, 0.5);
763 EFM_MIME_ICON_SIMPLE("inode/file","efm_generic_icon_content_inode_file.png", (83/114), (83/114), 240, 0.5);
764
765#undefine EFM_MIME_ICON
766#undefine EFM_MIME_ICON_SIMPLE
767
768 /* #define EFMICON(NAME, FILE, SIZE) \
769 * group { name: "e/icons/fileman/"NAME; \
770 * max: SIZE SIZE; \
771 * parts { \
772 * part { name: "icon"; \
773 * mouse_events: 0; \
774 * description { state: "default" 0.0; \
775 * aspect: 1.0 1.0; \
776 * aspect_preference: BOTH; \
777 * image.image: FILE COMP; \
778 * image.normal: FILE ; \
779 * } \
780 * } \
781 * } \
782 * } */
783 //EFMICON("folder","icon_efm_folder.png", 128)
784 //EFMICON("chrdev","icon_efm_file.png", 128)
785 //EFMICON("blkdev","icon_efm_file.png", 128)
786 //EFMICON("fifo","icon_efm_file.png", 128)
787 //EFMICON("socket","icon_efm_file.png", 128)
788 //EFMICON("executable","icon_efm_file.png", 128)
789 //EFMICON("home","icon_efm_home.png", 128)
790 //EFMICON("root","icon_efm_root.png", 128)
791 //EFMICON("tmp","icon_efm_tmp.png", 128)
792 //EFMICON("desktop","icon_efm_desktop.png", 128)
793 //EFMICON("hdd","icon_efm_hdd.png", 128)
794 //EFMICON("hd","icon_efm_hdd.png", 128)
795
796 // EFM Mime type icons //
797
798 #define MIMEICON(NAME, FILE, SIZE) \
799 group { \
800 name: "e/icons/fileman/mime/"NAME; \
801 max: SIZE SIZE; \
802 parts { \
803 part { \
804 name: "icon"; \
805 mouse_events: 0; \
806 description { \
807 state: "default" 0.0; \
808 aspect: 1.0 1.0; \
809 aspect_preference: BOTH; \
810 image.image: "O/"FILE COMP; \
811 image.normal: "O/"FILE ; \
812 } \
813 } \
814 } \
815 }
816
817// MIMEICON("inode/directory","icon_efm_folder.png", 128);
818
819 MIMEICON("application/x-deb","icon_mime_deb.png", 128);
820 MIMEICON("application/x-bzip","icon_mime_package.png", 128);
821 MIMEICON("application/zip","icon_mime_package.png", 128);
822 MIMEICON("application/x-gzip","icon_mime_package.png", 128);
823 MIMEICON("application/x-bzip-compressed-tar","icon_mime_package.png", 128);
824 MIMEICON("application/x-bzip2-compressed-tar","icon_mime_package.png",128);
825 MIMEICON("application/x-compressed-tar","icon_mime_package.png",128);
826 MIMEICON("application/x-tar","icon_mime_package.png", 128);
827 MIMEICON("application/x-rar","icon_mime_package.png", 128);
828
829 MIMEICON("application/x-7z-compressed","icon_mime_package.png", 128);
830 MIMEICON("application/vnd.ms-cab-compressed","icon_mime_package.png", 128);
831#endif
diff --git a/data/elementary/themes/img/close.svg b/data/elementary/themes/img/close.svg
new file mode 100644
index 0000000000..b639ceb201
--- /dev/null
+++ b/data/elementary/themes/img/close.svg
@@ -0,0 +1,69 @@
1<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2<svg
3 xmlns:dc="http://purl.org/dc/elements/1.1/"
4 xmlns:cc="http://creativecommons.org/ns#"
5 xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
6 xmlns:svg="http://www.w3.org/2000/svg"
7 xmlns="http://www.w3.org/2000/svg"
8 xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
9 xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
10 inkscape:export-ydpi="384"
11 inkscape:export-xdpi="384"
12 inkscape:export-filename="/home/raster/C/th-efl/th/img/ic/close-060.png"
13 inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
14 sodipodi:docname="close.svg"
15 viewBox="0 0 15 15"
16 height="15"
17 width="15"
18 id="svg2"
19 version="1.1">
20 <metadata
21 id="metadata8">
22 <rdf:RDF>
23 <cc:Work
24 rdf:about="">
25 <dc:format>image/svg+xml</dc:format>
26 <dc:type
27 rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
28 <dc:title></dc:title>
29 </cc:Work>
30 </rdf:RDF>
31 </metadata>
32 <defs
33 id="defs6" />
34 <sodipodi:namedview
35 inkscape:current-layer="g10"
36 inkscape:window-maximized="0"
37 inkscape:window-y="0"
38 inkscape:window-x="804"
39 inkscape:cy="7.5"
40 inkscape:cx="7.5"
41 inkscape:zoom="68.333333"
42 showgrid="true"
43 id="namedview4"
44 inkscape:window-height="1372"
45 inkscape:window-width="1756"
46 inkscape:pageshadow="2"
47 inkscape:pageopacity="0"
48 guidetolerance="10"
49 gridtolerance="10"
50 objecttolerance="10"
51 borderopacity="1"
52 bordercolor="#666666"
53 pagecolor="#404040">
54 <inkscape:grid
55 spacingy="0.5"
56 spacingx="0.5"
57 id="grid837"
58 type="xygrid" />
59 </sodipodi:namedview>
60 <g
61 id="g10"
62 inkscape:label="Image"
63 inkscape:groupmode="layer">
64 <path
65 id="path839"
66 d="m 10.5,3 1.5,1.5 -3,3 3,3 -1.5,1.5 -3,-3 -3,3 L 3,10.5 6,7.5 3,4.5 4.5,3 l 3,3 z"
67 style="fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1" />
68 </g>
69</svg>
diff --git a/data/elementary/themes/img/ic/arrow-d-015.png b/data/elementary/themes/img/ic/arrow-d-015.png
new file mode 100644
index 0000000000..15070f31eb
--- /dev/null
+++ b/data/elementary/themes/img/ic/arrow-d-015.png
Binary files differ
diff --git a/data/elementary/themes/img/ic/arrow-d-030.png b/data/elementary/themes/img/ic/arrow-d-030.png
new file mode 100644
index 0000000000..83993d8c80
--- /dev/null
+++ b/data/elementary/themes/img/ic/arrow-d-030.png
Binary files differ
diff --git a/data/elementary/themes/img/ic/arrow-d-060.png b/data/elementary/themes/img/ic/arrow-d-060.png
new file mode 100644
index 0000000000..d009ff8589
--- /dev/null
+++ b/data/elementary/themes/img/ic/arrow-d-060.png
Binary files differ
diff --git a/data/elementary/themes/img/ic/arrow-l-015.png b/data/elementary/themes/img/ic/arrow-l-015.png
new file mode 100644
index 0000000000..3e9b75f51a
--- /dev/null
+++ b/data/elementary/themes/img/ic/arrow-l-015.png
Binary files differ
diff --git a/data/elementary/themes/img/ic/arrow-l-030.png b/data/elementary/themes/img/ic/arrow-l-030.png
new file mode 100644
index 0000000000..3159f1bfc4
--- /dev/null
+++ b/data/elementary/themes/img/ic/arrow-l-030.png
Binary files differ
diff --git a/data/elementary/themes/img/ic/arrow-l-060.png b/data/elementary/themes/img/ic/arrow-l-060.png
new file mode 100644
index 0000000000..c94bf403a5
--- /dev/null
+++ b/data/elementary/themes/img/ic/arrow-l-060.png
Binary files differ
diff --git a/data/elementary/themes/img/ic/arrow-r-015.png b/data/elementary/themes/img/ic/arrow-r-015.png
new file mode 100644
index 0000000000..3a64dd58fd
--- /dev/null
+++ b/data/elementary/themes/img/ic/arrow-r-015.png
Binary files differ
diff --git a/data/elementary/themes/img/ic/arrow-r-030.png b/data/elementary/themes/img/ic/arrow-r-030.png
new file mode 100644
index 0000000000..d0a519aeef
--- /dev/null
+++ b/data/elementary/themes/img/ic/arrow-r-030.png
Binary files differ
diff --git a/data/elementary/themes/img/ic/arrow-r-060.png b/data/elementary/themes/img/ic/arrow-r-060.png
new file mode 100644
index 0000000000..6e2e952206
--- /dev/null
+++ b/data/elementary/themes/img/ic/arrow-r-060.png
Binary files differ
diff --git a/data/elementary/themes/img/ic/arrow-u-015.png b/data/elementary/themes/img/ic/arrow-u-015.png
new file mode 100644
index 0000000000..6925c82811
--- /dev/null
+++ b/data/elementary/themes/img/ic/arrow-u-015.png
Binary files differ
diff --git a/data/elementary/themes/img/ic/arrow-u-030.png b/data/elementary/themes/img/ic/arrow-u-030.png
new file mode 100644
index 0000000000..3faddb7168
--- /dev/null
+++ b/data/elementary/themes/img/ic/arrow-u-030.png
Binary files differ
diff --git a/data/elementary/themes/img/ic/arrow-u-060.png b/data/elementary/themes/img/ic/arrow-u-060.png
new file mode 100644
index 0000000000..2617e395e1
--- /dev/null
+++ b/data/elementary/themes/img/ic/arrow-u-060.png
Binary files differ
diff --git a/data/elementary/themes/img/ic/close-015.png b/data/elementary/themes/img/ic/close-015.png
new file mode 100644
index 0000000000..8f33967d14
--- /dev/null
+++ b/data/elementary/themes/img/ic/close-015.png
Binary files differ
diff --git a/data/elementary/themes/img/ic/close-030.png b/data/elementary/themes/img/ic/close-030.png
new file mode 100644
index 0000000000..e504e147a1
--- /dev/null
+++ b/data/elementary/themes/img/ic/close-030.png
Binary files differ
diff --git a/data/elementary/themes/img/ic/close-060.png b/data/elementary/themes/img/ic/close-060.png
new file mode 100644
index 0000000000..8b2e4aaf50
--- /dev/null
+++ b/data/elementary/themes/img/ic/close-060.png
Binary files differ
diff --git a/data/elementary/themes/img/ic/efm-computer-040.png b/data/elementary/themes/img/ic/efm-computer-040.png
new file mode 100644
index 0000000000..126774aa07
--- /dev/null
+++ b/data/elementary/themes/img/ic/efm-computer-040.png
Binary files differ
diff --git a/data/elementary/themes/img/ic/efm-computer-080.png b/data/elementary/themes/img/ic/efm-computer-080.png
new file mode 100644
index 0000000000..ad226050f7
--- /dev/null
+++ b/data/elementary/themes/img/ic/efm-computer-080.png
Binary files differ
diff --git a/data/elementary/themes/img/ic/efm-computer-160.png b/data/elementary/themes/img/ic/efm-computer-160.png
new file mode 100644
index 0000000000..aec1993aed
--- /dev/null
+++ b/data/elementary/themes/img/ic/efm-computer-160.png
Binary files differ
diff --git a/data/elementary/themes/img/ic/efm-desktop-040.png b/data/elementary/themes/img/ic/efm-desktop-040.png
new file mode 100644
index 0000000000..400167df52
--- /dev/null
+++ b/data/elementary/themes/img/ic/efm-desktop-040.png
Binary files differ
diff --git a/data/elementary/themes/img/ic/efm-desktop-080.png b/data/elementary/themes/img/ic/efm-desktop-080.png
new file mode 100644
index 0000000000..94c338202d
--- /dev/null
+++ b/data/elementary/themes/img/ic/efm-desktop-080.png
Binary files differ
diff --git a/data/elementary/themes/img/ic/efm-desktop-160.png b/data/elementary/themes/img/ic/efm-desktop-160.png
new file mode 100644
index 0000000000..cef65829f6
--- /dev/null
+++ b/data/elementary/themes/img/ic/efm-desktop-160.png
Binary files differ
diff --git a/data/elementary/themes/img/ic/efm-drive-cd-040.png b/data/elementary/themes/img/ic/efm-drive-cd-040.png
new file mode 100644
index 0000000000..513b910c1c
--- /dev/null
+++ b/data/elementary/themes/img/ic/efm-drive-cd-040.png
Binary files differ
diff --git a/data/elementary/themes/img/ic/efm-drive-cd-080.png b/data/elementary/themes/img/ic/efm-drive-cd-080.png
new file mode 100644
index 0000000000..b82f748ce2
--- /dev/null
+++ b/data/elementary/themes/img/ic/efm-drive-cd-080.png
Binary files differ
diff --git a/data/elementary/themes/img/ic/efm-drive-cd-160.png b/data/elementary/themes/img/ic/efm-drive-cd-160.png
new file mode 100644
index 0000000000..29d3351f16
--- /dev/null
+++ b/data/elementary/themes/img/ic/efm-drive-cd-160.png
Binary files differ
diff --git a/data/elementary/themes/img/ic/efm-drive-flash-040.png b/data/elementary/themes/img/ic/efm-drive-flash-040.png
new file mode 100644
index 0000000000..83d26acb7a
--- /dev/null
+++ b/data/elementary/themes/img/ic/efm-drive-flash-040.png
Binary files differ
diff --git a/data/elementary/themes/img/ic/efm-drive-flash-080.png b/data/elementary/themes/img/ic/efm-drive-flash-080.png
new file mode 100644
index 0000000000..1abf75c2e2
--- /dev/null
+++ b/data/elementary/themes/img/ic/efm-drive-flash-080.png
Binary files differ
diff --git a/data/elementary/themes/img/ic/efm-drive-flash-160.png b/data/elementary/themes/img/ic/efm-drive-flash-160.png
new file mode 100644
index 0000000000..97032bcbcd
--- /dev/null
+++ b/data/elementary/themes/img/ic/efm-drive-flash-160.png
Binary files differ
diff --git a/data/elementary/themes/img/ic/efm-drive-hdd-040.png b/data/elementary/themes/img/ic/efm-drive-hdd-040.png
new file mode 100644
index 0000000000..de8026bf91
--- /dev/null
+++ b/data/elementary/themes/img/ic/efm-drive-hdd-040.png
Binary files differ
diff --git a/data/elementary/themes/img/ic/efm-drive-hdd-080.png b/data/elementary/themes/img/ic/efm-drive-hdd-080.png
new file mode 100644
index 0000000000..a4378a5099
--- /dev/null
+++ b/data/elementary/themes/img/ic/efm-drive-hdd-080.png
Binary files differ
diff --git a/data/elementary/themes/img/ic/efm-drive-hdd-160.png b/data/elementary/themes/img/ic/efm-drive-hdd-160.png
new file mode 100644
index 0000000000..b66c321d95
--- /dev/null
+++ b/data/elementary/themes/img/ic/efm-drive-hdd-160.png
Binary files differ
diff --git a/data/elementary/themes/img/ic/efm-drive-usb-media-040.png b/data/elementary/themes/img/ic/efm-drive-usb-media-040.png
new file mode 100644
index 0000000000..8a61251fdc
--- /dev/null
+++ b/data/elementary/themes/img/ic/efm-drive-usb-media-040.png
Binary files differ
diff --git a/data/elementary/themes/img/ic/efm-drive-usb-media-080.png b/data/elementary/themes/img/ic/efm-drive-usb-media-080.png
new file mode 100644
index 0000000000..fa18537923
--- /dev/null
+++ b/data/elementary/themes/img/ic/efm-drive-usb-media-080.png
Binary files differ
diff --git a/data/elementary/themes/img/ic/efm-drive-usb-media-160.png b/data/elementary/themes/img/ic/efm-drive-usb-media-160.png
new file mode 100644
index 0000000000..47cf9e9df8
--- /dev/null
+++ b/data/elementary/themes/img/ic/efm-drive-usb-media-160.png
Binary files differ
diff --git a/data/elementary/themes/img/ic/efm-favorite-040.png b/data/elementary/themes/img/ic/efm-favorite-040.png
new file mode 100644
index 0000000000..fe2651f07a
--- /dev/null
+++ b/data/elementary/themes/img/ic/efm-favorite-040.png
Binary files differ
diff --git a/data/elementary/themes/img/ic/efm-favorite-080.png b/data/elementary/themes/img/ic/efm-favorite-080.png
new file mode 100644
index 0000000000..5b566f4546
--- /dev/null
+++ b/data/elementary/themes/img/ic/efm-favorite-080.png
Binary files differ
diff --git a/data/elementary/themes/img/ic/efm-favorite-160.png b/data/elementary/themes/img/ic/efm-favorite-160.png
new file mode 100644
index 0000000000..702d8cce55
--- /dev/null
+++ b/data/elementary/themes/img/ic/efm-favorite-160.png
Binary files differ
diff --git a/data/elementary/themes/img/ic/efm-folder-040.png b/data/elementary/themes/img/ic/efm-folder-040.png
new file mode 100644
index 0000000000..40250d17f9
--- /dev/null
+++ b/data/elementary/themes/img/ic/efm-folder-040.png
Binary files differ
diff --git a/data/elementary/themes/img/ic/efm-folder-080.png b/data/elementary/themes/img/ic/efm-folder-080.png
new file mode 100644
index 0000000000..fd6330940a
--- /dev/null
+++ b/data/elementary/themes/img/ic/efm-folder-080.png
Binary files differ
diff --git a/data/elementary/themes/img/ic/efm-folder-160.png b/data/elementary/themes/img/ic/efm-folder-160.png
new file mode 100644
index 0000000000..47b11675f1
--- /dev/null
+++ b/data/elementary/themes/img/ic/efm-folder-160.png
Binary files differ
diff --git a/data/elementary/themes/img/ic/efm-home-040.png b/data/elementary/themes/img/ic/efm-home-040.png
new file mode 100644
index 0000000000..84934789e7
--- /dev/null
+++ b/data/elementary/themes/img/ic/efm-home-040.png
Binary files differ
diff --git a/data/elementary/themes/img/ic/efm-home-080.png b/data/elementary/themes/img/ic/efm-home-080.png
new file mode 100644
index 0000000000..40a9b227fe
--- /dev/null
+++ b/data/elementary/themes/img/ic/efm-home-080.png
Binary files differ
diff --git a/data/elementary/themes/img/ic/efm-home-160.png b/data/elementary/themes/img/ic/efm-home-160.png
new file mode 100644
index 0000000000..eac104d2b7
--- /dev/null
+++ b/data/elementary/themes/img/ic/efm-home-160.png
Binary files differ
diff --git a/data/elementary/themes/img/ic/efm-temp-040.png b/data/elementary/themes/img/ic/efm-temp-040.png
new file mode 100644
index 0000000000..7024aa22e5
--- /dev/null
+++ b/data/elementary/themes/img/ic/efm-temp-040.png
Binary files differ
diff --git a/data/elementary/themes/img/ic/efm-temp-080.png b/data/elementary/themes/img/ic/efm-temp-080.png
new file mode 100644
index 0000000000..b108b6b1cb
--- /dev/null
+++ b/data/elementary/themes/img/ic/efm-temp-080.png
Binary files differ
diff --git a/data/elementary/themes/img/ic/efm-temp-160.png b/data/elementary/themes/img/ic/efm-temp-160.png
new file mode 100644
index 0000000000..53b32c5f9d
--- /dev/null
+++ b/data/elementary/themes/img/ic/efm-temp-160.png
Binary files differ
diff --git a/data/elementary/themes/img/ic/heart-015.png b/data/elementary/themes/img/ic/heart-015.png
new file mode 100644
index 0000000000..02113cb542
--- /dev/null
+++ b/data/elementary/themes/img/ic/heart-015.png
Binary files differ
diff --git a/data/elementary/themes/img/ic/heart-030.png b/data/elementary/themes/img/ic/heart-030.png
new file mode 100644
index 0000000000..a91796d061
--- /dev/null
+++ b/data/elementary/themes/img/ic/heart-030.png
Binary files differ
diff --git a/data/elementary/themes/img/ic/heart-060.png b/data/elementary/themes/img/ic/heart-060.png
new file mode 100644
index 0000000000..da92eb9013
--- /dev/null
+++ b/data/elementary/themes/img/ic/heart-060.png
Binary files differ
diff --git a/data/elementary/themes/img/ic/reload-015.png b/data/elementary/themes/img/ic/reload-015.png
new file mode 100644
index 0000000000..ace108737d
--- /dev/null
+++ b/data/elementary/themes/img/ic/reload-015.png
Binary files differ
diff --git a/data/elementary/themes/img/ic/reload-030.png b/data/elementary/themes/img/ic/reload-030.png
new file mode 100644
index 0000000000..ef4ad0538f
--- /dev/null
+++ b/data/elementary/themes/img/ic/reload-030.png
Binary files differ
diff --git a/data/elementary/themes/img/ic/reload-060.png b/data/elementary/themes/img/ic/reload-060.png
new file mode 100644
index 0000000000..3cea3f4b4f
--- /dev/null
+++ b/data/elementary/themes/img/ic/reload-060.png
Binary files differ
diff --git a/data/elementary/themes/img/ic/system-shutdown-040.png b/data/elementary/themes/img/ic/system-shutdown-040.png
new file mode 100644
index 0000000000..e2b3e00452
--- /dev/null
+++ b/data/elementary/themes/img/ic/system-shutdown-040.png
Binary files differ
diff --git a/data/elementary/themes/img/ic/system-shutdown-080.png b/data/elementary/themes/img/ic/system-shutdown-080.png
new file mode 100644
index 0000000000..2060b14e75
--- /dev/null
+++ b/data/elementary/themes/img/ic/system-shutdown-080.png
Binary files differ
diff --git a/data/elementary/themes/img/ic/system-shutdown-160.png b/data/elementary/themes/img/ic/system-shutdown-160.png
new file mode 100644
index 0000000000..1373758c02
--- /dev/null
+++ b/data/elementary/themes/img/ic/system-shutdown-160.png
Binary files differ
diff --git a/data/elementary/themes/img/ic/system-suspend-040.png b/data/elementary/themes/img/ic/system-suspend-040.png
new file mode 100644
index 0000000000..aa6daa2098
--- /dev/null
+++ b/data/elementary/themes/img/ic/system-suspend-040.png
Binary files differ
diff --git a/data/elementary/themes/img/ic/system-suspend-080.png b/data/elementary/themes/img/ic/system-suspend-080.png
new file mode 100644
index 0000000000..5a32c58622
--- /dev/null
+++ b/data/elementary/themes/img/ic/system-suspend-080.png
Binary files differ
diff --git a/data/elementary/themes/img/ic/system-suspend-160.png b/data/elementary/themes/img/ic/system-suspend-160.png
new file mode 100644
index 0000000000..a5510e2a51
--- /dev/null
+++ b/data/elementary/themes/img/ic/system-suspend-160.png
Binary files differ
diff --git a/data/elementary/themes/img/ic/unknown-040.png b/data/elementary/themes/img/ic/unknown-040.png
new file mode 100644
index 0000000000..83b8951604
--- /dev/null
+++ b/data/elementary/themes/img/ic/unknown-040.png
Binary files differ
diff --git a/data/elementary/themes/img/ic/unknown-080.png b/data/elementary/themes/img/ic/unknown-080.png
new file mode 100644
index 0000000000..5804bba034
--- /dev/null
+++ b/data/elementary/themes/img/ic/unknown-080.png
Binary files differ
diff --git a/data/elementary/themes/img/ic/unknown-160.png b/data/elementary/themes/img/ic/unknown-160.png
new file mode 100644
index 0000000000..35ea871de8
--- /dev/null
+++ b/data/elementary/themes/img/ic/unknown-160.png
Binary files differ
diff --git a/data/elementary/themes/img/system-shutdown.svg b/data/elementary/themes/img/system-shutdown.svg
new file mode 100644
index 0000000000..fa7bfe434e
--- /dev/null
+++ b/data/elementary/themes/img/system-shutdown.svg
@@ -0,0 +1,80 @@
1<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2<svg
3 xmlns:dc="http://purl.org/dc/elements/1.1/"
4 xmlns:cc="http://creativecommons.org/ns#"
5 xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
6 xmlns:svg="http://www.w3.org/2000/svg"
7 xmlns="http://www.w3.org/2000/svg"
8 xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
9 xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
10 inkscape:export-ydpi="48"
11 inkscape:export-xdpi="48"
12 inkscape:export-filename="/home/raster/C/th-efl/th/img/ic/system-shutdown-040.png"
13 inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
14 sodipodi:docname="system-shutdown.svg"
15 viewBox="0 0 80 80"
16 height="80"
17 width="80"
18 id="svg2"
19 version="1.1">
20 <metadata
21 id="metadata8">
22 <rdf:RDF>
23 <cc:Work
24 rdf:about="">
25 <dc:format>image/svg+xml</dc:format>
26 <dc:type
27 rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
28 <dc:title></dc:title>
29 </cc:Work>
30 </rdf:RDF>
31 </metadata>
32 <defs
33 id="defs6" />
34 <sodipodi:namedview
35 inkscape:current-layer="g10"
36 inkscape:window-maximized="0"
37 inkscape:window-y="0"
38 inkscape:window-x="0"
39 inkscape:cy="40.047847"
40 inkscape:cx="40"
41 inkscape:zoom="10.45"
42 showgrid="true"
43 id="namedview4"
44 inkscape:window-height="1017"
45 inkscape:window-width="1920"
46 inkscape:pageshadow="2"
47 inkscape:pageopacity="0"
48 guidetolerance="10"
49 gridtolerance="10"
50 objecttolerance="10"
51 borderopacity="1"
52 bordercolor="#666666"
53 pagecolor="#404040">
54 <inkscape:grid
55 id="grid837"
56 type="xygrid" />
57 </sodipodi:namedview>
58 <g
59 id="g10"
60 inkscape:label="Image"
61 inkscape:groupmode="layer">
62 <path
63 id="path839"
64 d="M 40,16 V 40"
65 style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" />
66 <path
67 d="M 53.025372,17.249662 A 26.044935,26.044935 0 0 1 65.160378,46.546163 26.044935,26.044935 0 0 1 40.002903,65.850172 26.044935,26.044935 0 0 1 14.845427,46.546162 26.044935,26.044935 0 0 1 26.980435,17.249661"
68 sodipodi:arc-type="arc"
69 sodipodi:open="true"
70 sodipodi:end="4.1887902"
71 sodipodi:start="5.2359878"
72 sodipodi:ry="26.044935"
73 sodipodi:rx="26.044935"
74 sodipodi:cy="39.805237"
75 sodipodi:cx="40.002903"
76 sodipodi:type="arc"
77 id="path841"
78 style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
79 </g>
80</svg>
diff --git a/data/elementary/themes/img/system-suspend.svg b/data/elementary/themes/img/system-suspend.svg
new file mode 100644
index 0000000000..864af7e167
--- /dev/null
+++ b/data/elementary/themes/img/system-suspend.svg
@@ -0,0 +1,78 @@
1<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2<svg
3 xmlns:dc="http://purl.org/dc/elements/1.1/"
4 xmlns:cc="http://creativecommons.org/ns#"
5 xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
6 xmlns:svg="http://www.w3.org/2000/svg"
7 xmlns="http://www.w3.org/2000/svg"
8 xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
9 xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
10 inkscape:export-ydpi="48"
11 inkscape:export-xdpi="48"
12 inkscape:export-filename="/home/raster/C/th-efl/th/img/ic/system-suspend-040.png"
13 inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
14 sodipodi:docname="system-suspend.svg"
15 viewBox="0 0 80 80"
16 height="80"
17 width="80"
18 id="svg2"
19 version="1.1">
20 <metadata
21 id="metadata8">
22 <rdf:RDF>
23 <cc:Work
24 rdf:about="">
25 <dc:format>image/svg+xml</dc:format>
26 <dc:type
27 rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
28 <dc:title></dc:title>
29 </cc:Work>
30 </rdf:RDF>
31 </metadata>
32 <defs
33 id="defs6" />
34 <sodipodi:namedview
35 inkscape:current-layer="g10"
36 inkscape:window-maximized="0"
37 inkscape:window-y="0"
38 inkscape:window-x="0"
39 inkscape:cy="40.047847"
40 inkscape:cx="40"
41 inkscape:zoom="10.45"
42 showgrid="true"
43 id="namedview4"
44 inkscape:window-height="1017"
45 inkscape:window-width="1920"
46 inkscape:pageshadow="2"
47 inkscape:pageopacity="0"
48 guidetolerance="10"
49 gridtolerance="10"
50 objecttolerance="10"
51 borderopacity="1"
52 bordercolor="#666666"
53 pagecolor="#404040">
54 <inkscape:grid
55 id="grid837"
56 type="xygrid" />
57 </sodipodi:namedview>
58 <g
59 id="g10"
60 inkscape:label="Image"
61 inkscape:groupmode="layer">
62 <ellipse
63 ry="25.841658"
64 rx="25.89924"
65 cy="40.088707"
66 cx="40.031124"
67 id="path943"
68 style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
69 <path
70 id="path945"
71 d="m 32,28 c 0,24 0,24 0,24 v 0"
72 style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none;fill-opacity:1" />
73 <path
74 style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
75 d="m 48,28 c 0,24 0,24 0,24 v 0"
76 id="path947" />
77 </g>
78</svg>
diff --git a/data/elementary/themes/macros.edc b/data/elementary/themes/macros.edc
index 7270d716bb..720c25deba 100644
--- a/data/elementary/themes/macros.edc
+++ b/data/elementary/themes/macros.edc
@@ -132,7 +132,7 @@
132 offscale 132 offscale
133#define WIN_SHADOW_SPACER \ 133#define WIN_SHADOW_SPACER \
134 rel1.offset: 21 14; \ 134 rel1.offset: 21 14; \
135 rel2.offset: -21 -28; \ 135 rel2.offset: -22 -29; \
136 offscale 136 offscale
137#define WIN_MENU_SHADOW \ 137#define WIN_MENU_SHADOW \
138 image.normal: "win_menu_shadow.png"; \ 138 image.normal: "win_menu_shadow.png"; \