raster pushed a commit to branch feature/themes/flat.
http://git.enlightenment.org/core/efl.git/commit/?id=87d30cd7fdae5cda844a6be433b5fe03234a77e2
commit 87d30cd7fdae5cda844a6be433b5fe03234a77e2
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
Date: Tue Jun 30 21:22:16 2020 +0100
TH - scaling and start work on making lots of icons scale better
---
data/elementary/themes/default.edc | 8 +-
data/elementary/themes/edc/border.edc | 33 +-
data/elementary/themes/edc/comp.edc | 3 +-
data/elementary/themes/edc/elm/border.edc | 202 ++---
data/elementary/themes/edc/elm/button.edc | 36 +-
data/elementary/themes/edc/elm/entry.edc | 73 +-
data/elementary/themes/edc/elm/gengrid.edc | 2 +-
data/elementary/themes/edc/elm/panel.edc | 30 +-
data/elementary/themes/edc/elm/pointer.edc | 65 +-
data/elementary/themes/edc/elm/toolbar.edc | 22 +-
data/elementary/themes/edc/fileman.edc | 28 +-
data/elementary/themes/edc/icons.edc | 125 ++--
data/elementary/themes/edc/start.edc | 31 +-
data/elementary/themes/ic.edc | 831 +++++++++++++++++++++
data/elementary/themes/img/close.svg | 69 ++
data/elementary/themes/img/ic/arrow-d-015.png | Bin 0 -> 2668 bytes
data/elementary/themes/img/ic/arrow-d-030.png | Bin 0 -> 2958 bytes
data/elementary/themes/img/ic/arrow-d-060.png | Bin 0 -> 3391 bytes
data/elementary/themes/img/ic/arrow-l-015.png | Bin 0 -> 2668 bytes
data/elementary/themes/img/ic/arrow-l-030.png | Bin 0 -> 2948 bytes
data/elementary/themes/img/ic/arrow-l-060.png | Bin 0 -> 3349 bytes
data/elementary/themes/img/ic/arrow-r-015.png | Bin 0 -> 2682 bytes
data/elementary/themes/img/ic/arrow-r-030.png | Bin 0 -> 2942 bytes
data/elementary/themes/img/ic/arrow-r-060.png | Bin 0 -> 3343 bytes
data/elementary/themes/img/ic/arrow-u-015.png | Bin 0 -> 2677 bytes
data/elementary/themes/img/ic/arrow-u-030.png | Bin 0 -> 2933 bytes
data/elementary/themes/img/ic/arrow-u-060.png | Bin 0 -> 3375 bytes
data/elementary/themes/img/ic/close-015.png | Bin 0 -> 124 bytes
data/elementary/themes/img/ic/close-030.png | Bin 0 -> 291 bytes
data/elementary/themes/img/ic/close-060.png | Bin 0 -> 422 bytes
data/elementary/themes/img/ic/efm-computer-040.png | Bin 0 -> 412 bytes
data/elementary/themes/img/ic/efm-computer-080.png | Bin 0 -> 552 bytes
data/elementary/themes/img/ic/efm-computer-160.png | Bin 0 -> 831 bytes
data/elementary/themes/img/ic/efm-desktop-040.png | Bin 0 -> 775 bytes
data/elementary/themes/img/ic/efm-desktop-080.png | Bin 0 -> 1537 bytes
data/elementary/themes/img/ic/efm-desktop-160.png | Bin 0 -> 3094 bytes
data/elementary/themes/img/ic/efm-drive-cd-040.png | Bin 0 -> 1422 bytes
data/elementary/themes/img/ic/efm-drive-cd-080.png | Bin 0 -> 3031 bytes
data/elementary/themes/img/ic/efm-drive-cd-160.png | Bin 0 -> 6303 bytes
.../themes/img/ic/efm-drive-flash-040.png | Bin 0 -> 417 bytes
.../themes/img/ic/efm-drive-flash-080.png | Bin 0 -> 659 bytes
.../themes/img/ic/efm-drive-flash-160.png | Bin 0 -> 1087 bytes
.../elementary/themes/img/ic/efm-drive-hdd-040.png | Bin 0 -> 1358 bytes
.../elementary/themes/img/ic/efm-drive-hdd-080.png | Bin 0 -> 2914 bytes
.../elementary/themes/img/ic/efm-drive-hdd-160.png | Bin 0 -> 5760 bytes
.../themes/img/ic/efm-drive-usb-media-040.png | Bin 0 -> 456 bytes
.../themes/img/ic/efm-drive-usb-media-080.png | Bin 0 -> 813 bytes
.../themes/img/ic/efm-drive-usb-media-160.png | Bin 0 -> 1607 bytes
data/elementary/themes/img/ic/efm-favorite-040.png | Bin 0 -> 1190 bytes
data/elementary/themes/img/ic/efm-favorite-080.png | Bin 0 -> 2374 bytes
data/elementary/themes/img/ic/efm-favorite-160.png | Bin 0 -> 4778 bytes
data/elementary/themes/img/ic/efm-folder-040.png | Bin 0 -> 420 bytes
data/elementary/themes/img/ic/efm-folder-080.png | Bin 0 -> 728 bytes
data/elementary/themes/img/ic/efm-folder-160.png | Bin 0 -> 1283 bytes
data/elementary/themes/img/ic/efm-home-040.png | Bin 0 -> 314 bytes
data/elementary/themes/img/ic/efm-home-080.png | Bin 0 -> 507 bytes
data/elementary/themes/img/ic/efm-home-160.png | Bin 0 -> 895 bytes
data/elementary/themes/img/ic/efm-temp-040.png | Bin 0 -> 858 bytes
data/elementary/themes/img/ic/efm-temp-080.png | Bin 0 -> 1785 bytes
data/elementary/themes/img/ic/efm-temp-160.png | Bin 0 -> 3509 bytes
data/elementary/themes/img/ic/heart-015.png | Bin 0 -> 241 bytes
data/elementary/themes/img/ic/heart-030.png | Bin 0 -> 343 bytes
data/elementary/themes/img/ic/heart-060.png | Bin 0 -> 627 bytes
data/elementary/themes/img/ic/reload-015.png | Bin 0 -> 287 bytes
data/elementary/themes/img/ic/reload-030.png | Bin 0 -> 402 bytes
data/elementary/themes/img/ic/reload-060.png | Bin 0 -> 803 bytes
.../themes/img/ic/system-shutdown-040.png | Bin 0 -> 695 bytes
.../themes/img/ic/system-shutdown-080.png | Bin 0 -> 1447 bytes
.../themes/img/ic/system-shutdown-160.png | Bin 0 -> 2991 bytes
.../themes/img/ic/system-suspend-040.png | Bin 0 -> 765 bytes
.../themes/img/ic/system-suspend-080.png | Bin 0 -> 1518 bytes
.../themes/img/ic/system-suspend-160.png | Bin 0 -> 3122 bytes
data/elementary/themes/img/ic/unknown-040.png | Bin 0 -> 383 bytes
data/elementary/themes/img/ic/unknown-080.png | Bin 0 -> 605 bytes
data/elementary/themes/img/ic/unknown-160.png | Bin 0 -> 1084 bytes
data/elementary/themes/img/system-shutdown.svg | 80 ++
data/elementary/themes/img/system-suspend.svg | 78 ++
data/elementary/themes/macros.edc | 2 +-
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";
data.item: "efl_theme_base" "dark";
collections {
+#include "ic.edc"
+
#include "fonts.edc"
#include "colorclasses.edc"
// elm
#include "edc/elm/bg.edc"
#include "edc/elm/button.edc"
-// XXX: mobile mode needs invisible scrollers... make signals that do this
#include "edc/elm/scroller.edc"
-// XXX: mobile mode needs different entry setup
#include "edc/elm/entry.edc"
#include "edc/elm/frame.edc"
#include "edc/elm/label.edc"
@@ -66,7 +66,6 @@ collections {
#include "edc/elm/panel.edc"
#include "edc/elm/popup.edc"
#include "edc/elm/border.edc"
-// XXX: min size calc problems - too wide! ... err ok on my 32bit box... eh?
#include "edc/elm/spinner.edc"
#include "edc/elm/menu.edc"
#include "edc/elm/clock.edc"
@@ -176,11 +175,9 @@ collections {
#include "edc/efl/calendar.edc"
#include "edc/efl/navigation_bar.edc"
#include "edc/efl/navigation_layout.edc"
-// XXX: mobile mode needs invisible scrollers... make signals that do this
#include "edc/efl/scroller.edc"
#include "edc/efl/list.edc"
#include "edc/efl/grid.edc"
-// XXX: mobile mode needs different entry setup
#include "edc/efl/text.edc"
#include "edc/efl/frame.edc"
#include "edc/efl/check.edc"
@@ -200,7 +197,6 @@ collections {
#include "edc/efl/spin_button.edc"
#include "edc/efl/datepicker.edc"
#include "edc/efl/timepicker.edc"
-// XXX: min size calc problems - too wide! ... err ok on my 32bit box... eh?
#include "edc/efl/cursor.edc"
#include "edc/efl/pointer.edc"
#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";
group { name: "e/widgets/border/default/border";
alias: "e/widgets/border/shaped/border";
- images.image: "border_close.png" COMP;
- images.image: "border_maximize.png" COMP;
- images.image: "border_minimize.png" COMP;
IMAGE_RING("ringa", 160)
IMAGE_RING("ringb", 160)
@@ -186,12 +183,12 @@ group { name: "e/widgets/border/default/border";
}
}
part { name: "top"; type: RECT; mouse_events: 0;
-// scale: 1;
+ scale: 1;
description { state: "default" 0.0;
rel2.to_y: "e.text.title";
- rel2.offset: -1 3;
+ rel2.offset: -1 2;
color: 64 64 64 255;
-// offscale;
+ offscale;
}
description { state: "focused" 0.0;
inherit: "default" 0.0;
@@ -202,10 +199,10 @@ group { name: "e/widgets/border/default/border";
scale: 1;
description { state: "default" 0.0;
rel1.relative: 1.0 0.0;
- rel1.offset: 1 3;
+ rel1.offset: 1 4;
rel1.to_x: "e.swallow.volume";
rel2.relative: 0.0 0.0;
- rel2.offset: -2 3;
+ rel2.offset: -2 4;
rel2.to_x: "e.event.minimize";
align: 0.5 0.0;
color: 160 160 160 255;
@@ -216,7 +213,7 @@ group { name: "e/widgets/border/default/border";
min: 0 1;
}
fixed: 0 1;
-// offscale;
+ offscale;
}
description { state: "focused" 0.0;
inherit: "default" 0.0;
@@ -278,8 +275,9 @@ group { name: "e/widgets/border/default/border";
}
}
part { name: "close1"; mouse_events: 0;
+ scale: 1;
description { state: "default" 0.0;
- image.normal: "border_close.png";
+ image.normal: "i-close";
rel.to: "e.event.close";
min: 15 15; max: 15 15;
fixed: 1 1;
@@ -292,8 +290,9 @@ group { name: "e/widgets/border/default/border";
}
part { name: "max1"; mouse_events: 0;
clip_to: "clip1";
+ scale: 1;
description { state: "default" 0.0;
- image.normal: "border_maximize.png";
+ image.normal: "i-arrow-u";
rel.to: "e.event.maximize";
min: 15 15; max: 15 15;
fixed: 1 1;
@@ -306,8 +305,9 @@ group { name: "e/widgets/border/default/border";
}
part { name: "min1"; mouse_events: 0;
clip_to: "clip1";
+ scale: 1;
description { state: "default" 0.0;
- image.normal: "border_minimize.png";
+ image.normal: "i-arrow-d";
rel.to: "e.event.minimize";
min: 15 15; max: 15 15;
fixed: 1 1;
@@ -320,8 +320,9 @@ group { name: "e/widgets/border/default/border";
}
part { name: "close2"; mouse_events: 0;
clip_to: "clip2";
+ scale: 1;
description { state: "default" 0.0;
- image.normal: "border_close.png";
+ image.normal: "i-close";
rel.to: "e.event.close";
min: 15 15; max: 15 15;
fixed: 1 1;
@@ -334,8 +335,9 @@ group { name: "e/widgets/border/default/border";
}
part { name: "max2"; mouse_events: 0;
clip_to: "clip2";
+ scale: 1;
description { state: "default" 0.0;
- image.normal: "border_maximize.png";
+ image.normal: "i-arrow-u";
rel.to: "e.event.maximize";
min: 15 15; max: 15 15;
fixed: 1 1;
@@ -348,8 +350,9 @@ group { name: "e/widgets/border/default/border";
}
part { name: "min2"; mouse_events: 0;
clip_to: "clip2";
+ scale: 1;
description { state: "default" 0.0;
- image.normal: "border_minimize.png";
+ image.normal: "i-arrow-d";
rel.to: "e.event.minimize";
min: 15 15; max: 15 15;
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";
}
part { name: "e.text.label"; type: TEXT; mouse_events: 0;
scale: 1;
- effect: SHADOW BOTTOM;
description { state: "default" 0.0;
- color: FN_COL_DEFAULT;
+ color: 255 255 255 255;
text { font: FNBD; size: 10;
text_class: "fileman_icon";
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 @@
*/
group { name: "elm/border/base/default";
- images.image: "border_close.png" COMP;
- images.image: "border_maximize.png" COMP;
- images.image: "border_minimize.png" COMP;
-
- images.image: "glow_round_corners_small.png" COMP;
- images.image: "knob_round_small_busy.png" COMP;
-
- images.image: "win_shadow.png" COMP;
+ images.image: "win_shad_flat.png" COMP;
data.item: "shadow" "1";
data.item: "version" "119";
parts {
@@ -37,10 +30,17 @@ group { name: "elm/border/base/default";
rel2.relative: 1.0 0.0;
}
}
- /* shadow spacer and clipper */
- spacer { "shadow_spacer";
+ part { name: "shadow_clip"; type: RECT; mouse_events: 0;
+ description { state: "default";
+ rel.to: "_sh1";
+ }
+ description { state: "hidden";
+ visible: 0;
+ }
+ }
+ part { name: "shadow_base"; type: SPACER;
scale: 1;
- desc { "default";
+ description { state: "default" 0.0;
WIN_SHADOW_SPACER;
}
desc { "hidden";
@@ -48,17 +48,9 @@ group { name: "elm/border/base/default";
rel2.offset: -1 -1;
}
}
- image { "shadow"; nomouse;
- scale: 1;
- desc { "default";
- rel.to: "shadow_spacer";
- WIN_SHADOW;
- }
- desc { "hidden"; inherit: "default"; hid; }
- }
+ WIN_SHAD("shadow_base", "shadow_clip", "win_shad_flat.png", 21, 21, 14,
28, 0.5)
/* window background: solid color */
- rect { "bg_clip";
- nomouse;
+ rect { "bg_clip"; nomouse;
desc { "default";
rel1.to: "top_clip";
rel1.relative: 0.0 1.0;
@@ -69,8 +61,7 @@ group { name: "elm/border/base/default";
required; // @since 1.19
clip: "bg_clip";
desc { "default";
- color: 255 255 255 255;
- color_class: "elm/win/background"; // FIXME: color_class naming
scheme
+ color: 64 64 64 255;
visible: 0;
}
desc { "visible";
@@ -101,6 +92,8 @@ group { name: "elm/border/base/default";
color: 64 64 64 255; // FIXME: color_class
align: 0.5 0.0;
rel.to: "elm.swallow.menu";
+ fixed: 1 1;
+ visible: 0;
}
}
swallow { "elm.swallow.menu";
@@ -108,12 +101,16 @@ group { name: "elm/border/base/default";
desc { "default";
rel.to: "top_clip";
visible: 0;
- align: 0.5 0.0;
+ align: 0.5 1.0;
fixed: 1 1;
+ rel1.relative: 0.0 1.0;
+ rel1.offset: 0 -1;
}
desc { "visible"; inherit: "default";
- visible: 1;
- fixed: 0 1;
+// rel1.offset: 0 0;
+// align: 0.5 0.0;
+// visible: 1;
+// fixed: 0 1;
}
}
@@ -162,21 +159,21 @@ group { name: "elm/border/base/default";
/* top title bar - spacer and clipper */
rect { "top_clip"; //nomouse;
-// scale: 1;
+ scale: 1;
desc { "default";
- rel1.to: "shadow_spacer";
+ rel1.to: "shadow_base";
+ rel2.to_x: "shadow_base";
rel2.to_y: "elm.text.title";
- rel2.to_x: "shadow_spacer";
- rel2.offset: -1 3;
+ rel2.offset: -1 2;
vis;
-// offscale;
+ offscale;
}
desc { "hidden";
inherit: "default";
rel1.to: "";
rel2.to: "";
rel1.relative: 0.0 0.0;
- rel2.to: "shadow_spacer";
+ rel2.to: "shadow_base";
rel2.relative: 1.0 0.0;
rel2.offset: -1 0;
max: -1 0;
@@ -202,13 +199,13 @@ group { name: "elm/border/base/default";
clip: "top_clip";
description { state: "default" 0.0;
rel1.relative: 1.0 0.0;
- rel1.offset: 1 3;
+ rel1.offset: 1 4;
rel1.to_x: "icon";
- rel1.to_y: "shadow_spacer";
+ rel1.to_y: "shadow_base";
rel2.relative: 0.0 0.0;
- rel2.offset: -2 3;
+ rel2.offset: -2 4;
rel2.to_x: "elm.event.minimize";
- rel2.to_y: "shadow_spacer";
+ rel2.to_y: "shadow_base";
align: 0.5 0.0;
color: 160 160 160 255;
min: 0 16;
@@ -218,7 +215,7 @@ group { name: "elm/border/base/default";
min: 0 1;
}
fixed: 0 1;
-// offscale;
+ offscale;
}
description { state: "focused" 0.0;
inherit: "default" 0.0;
@@ -250,49 +247,6 @@ group { name: "elm/border/base/default";
rel2.offset: 0 0;
}
}
- rect { "busy_clip"; nomouse;
- desc { "default";
- color: 255 255 255 0;
- visible: 0;
- }
- desc { "hung";
- inherit: "default";
- color: 255 255 255 255;
- visible: 1;
- }
- }
- image { "knob"; nomouse;
- clip: "busy_clip";
- desc { "default";
- fixed: 1 1;
- image.normal: "knob_round_small_busy.png";
- aspect: 1.0 1.0; aspect_preference: VERTICAL;
- max: 20 20;
- rel1.relative: 1.0 0.0;
- rel1.offset: 2 -0;
- rel1.to: "elm.event.icon";
- rel2.relative: 1.0 1.0;
- rel2.offset: 2 -1;
- rel2.to: "elm.event.icon";
- align: 0.0 0.5;
- fixed: 1 1;
- }
- }
- image { "knob_spinner"; nomouse;
- clip: "busy_clip";
- desc { "default";
- fixed: 1 1;
- rel.to: "knob";
- image.normal: "glow_round_corners_small.png";
- map.on: 1;
- map.smooth: 1;
- map.rotation.center: "knob";
- }
- desc { "spin";
- inherit: "default";
- map.rotation.z: 360;
- }
- }
rect { "clip1"; nomouse;
desc { "default";
rel.to: "top_clip";
@@ -314,8 +268,9 @@ group { name: "elm/border/base/default";
}
image { "close1"; nomouse;
clip: "clip1";
+ scale: 1;
desc { "default";
- image.normal: "border_close.png";
+ image.normal: "i-close";
rel.to: "elm.event.close";
min: 15 15; max: 15 15;
fixed: 1 1;
@@ -328,8 +283,9 @@ group { name: "elm/border/base/default";
}
image { "max1"; nomouse;
clip: "clip1";
+ scale: 1;
desc { "default";
- image.normal: "border_maximize.png";
+ image.normal: "i-arrow-u";
rel.to: "elm.event.maximize";
min: 15 15; max: 15 15;
fixed: 1 1;
@@ -342,8 +298,9 @@ group { name: "elm/border/base/default";
}
image { "min1"; nomouse;
clip: "clip1";
+ scale: 1;
desc { "default";
- image.normal: "border_minimize.png";
+ image.normal: "i-arrow-d";
rel.to: "elm.event.minimize";
min: 15 15; max: 15 15;
fixed: 1 1;
@@ -356,44 +313,47 @@ group { name: "elm/border/base/default";
}
image { "close2"; nomouse;
clip: "clip2";
+ scale: 1;
desc { "default";
- image.normal: "border_close.png";
+ image.normal: "i-close";
rel.to: "elm.event.close";
min: 15 15; max: 15 15;
fixed: 1 1;
- color: 160 160 160 255;
+ color: 255 255 255 255;
}
desc { "selected";
inherit: "default";
- color: 255 255 255 255;
+ color: 220 220 220 255;
}
}
image { "max2"; nomouse;
clip: "clip2";
+ scale: 1;
desc { "default";
- image.normal: "border_maximize.png";
+ image.normal: "i-arrow-u";
rel.to: "elm.event.maximize";
min: 15 15; max: 15 15;
fixed: 1 1;
- color: 160 160 160 255;
+ color: 255 255 255 255;
}
desc { "selected";
inherit: "default";
- color: 255 255 255 255;
+ color: 220 220 220 255;
}
}
image { "min2"; nomouse;
clip: "clip2";
+ scale: 1;
desc { "default";
- image.normal: "border_minimize.png";
+ image.normal: "i-arrow-d";
rel.to: "elm.event.minimize";
min: 15 15; max: 15 15;
fixed: 1 1;
- color: 160 160 160 255;
+ color: 255 255 255 255;
}
desc { "selected";
inherit: "default";
- color: 255 255 255 255;
+ color: 220 220 220 255;
}
}
rect { "elm.event.icon";
@@ -524,14 +484,16 @@ group { name: "elm/border/base/default";
rect { "bottom_clip";
scale: 1;
desc { "default";
- rel.to: "shadow_spacer";
- rel1 { relative: 0.0 1.0; offset: 0 -5; }
+ rel.to: "shadow_base";
+ rel1 { relative: 0.0 1.0; offset: 0 -1; }
+ align: 0.0 1.0;
min: 0 5;
fixed: 0 1;
}
desc { "hidden";
inherit: "default";
rel1 { relative: 0.0 1.0; offset: 0 0; }
+ rel2 { relative: 1.0 1.0; offset: 0 0; }
min: 0 0;
hid;
}
@@ -671,12 +633,14 @@ group { name: "elm/border/base/default";
program {
signal: "elm,state,shadow,on"; source: "elm";
action: STATE_SET "default";
- targets: "shadow_spacer" "shadow";
+ target: "shadow_clip";
+ target: "shadow_base";
}
program {
signal: "elm,state,shadow,off"; source: "elm";
action: STATE_SET "hidden";
- targets: "shadow_spacer" "shadow";
+ target: "shadow_clip";
+ target: "shadow_base";
}
program {
signal: "elm,state,background,solid,on"; source: "elm";
@@ -737,41 +701,6 @@ group { name: "elm/border/base/default";
action: STATE_SET "default";
target: "icon";
}
- program { name: "spin";
- signal: "elm,state,hung"; source: "elm";
- action: STATE_SET "spin";
- transition: LINEAR 1.0;
- target: "knob_spinner";
- after: "spin2";
- }
- program { name: "spin2";
- action: STATE_SET "default";
- target: "knob_spinner";
- after: "spin";
- }
- program {
- signal: "elm,state,hung"; source: "elm";
- action: STATE_SET "hung";
- transition: SINUSOIDAL 0.25;
- target: "busy_clip";
- }
- program {
- signal: "elm,state,unhung"; source: "elm";
- action: STATE_SET "default";
- transition: SINUSOIDAL 1.0;
- target: "busy_clip";
- after: "spin3";
- }
- program { name: "spin3";
- action: ACTION_STOP;
- target: "spin";
- target: "spin2";
- after: "spin4";
- }
- program { name: "spin4";
- action: STATE_SET "default";
- target: "knob_spinner";
- }
/* maximize & unmaximize */
program {
@@ -1096,25 +1025,22 @@ group { name: "elm/border/dialog/default";
group { name: "elm/border/naviframe/default";
inherit: "elm/border/dialog/default";
- images.image: "sym_left_dark_normal.png" COMP;
- images.image: "sym_left_glow_normal.png" COMP;
- images.image: "sym_left_light_normal.png" COMP;
parts {
image { "close1";
desc { "default";
- image.normal: "sym_left_dark_normal.png";
+ image.normal: "i-arrow-l";
}
desc { "selected";
- image.normal: "sym_left_glow_normal.png";
+ image.normal: "i-arrow-l";
}
}
image { "close2"; nomouse;
clip: "clip2";
desc { "default";
- image.normal: "sym_left_light_normal.png";
+ image.normal: "i-arrow-l";
}
desc { "selected";
- image.normal: "sym_left_glow_normal.png";
+ image.normal: "i-arrow-l";
}
}
}
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";
fixed: 1 1;
min: 15 15;
max: 15 15;
- image.normal: "ic-arrow-l";
+ image.normal: "i-arrow-l";
color: 160 160 160 255;
}
}
@@ -643,7 +643,7 @@ group { name: "elm/button/base/colorselector/right/default";
fixed: 1 1;
min: 15 15;
max: 15 15;
- image.normal: "ic-arrow-r";
+ image.normal: "i-arrow-r";
color: 160 160 160 255;
}
}
@@ -1178,18 +1178,6 @@ group { name:
"elm/button/base/hoversel_horizontal_entry/default";
}
/******************* SPINNER BUTTONS STYLES **********************/
-#define IC(_NAME, _ICON) \
-set { name: _NAME; \
- image {image: _ICON"-060.png" COMP; size: 31 31 60000 60000; } \
- image {image: _ICON"-030.png" COMP; size: 16 16 30 30; } \
- image {image: _ICON"-015.png" COMP; size: 0 0 15 15; } \
-}
-IC("ic-arrow-l", "arrow-l")
-IC("ic-arrow-r", "arrow-r")
-IC("ic-arrow-u", "arrow-u")
-IC("ic-arrow-d", "arrow-d")
-#undef IC
-
group { name: "elm/button/base/spinner/increase/default";
alias: "elm/button/base/spinner/increase/colorselector/default";
alias: "elm/button/base/spin_button/increase/default";
@@ -1204,7 +1192,7 @@ IC("ic-arrow-d", "arrow-d")
scale: 1;
description { state: "default" 0.0;
FIXED_SIZE(15, 15)
- image.normal: "ic-arrow-r";
+ image.normal: "i-arrow-r";
color: 160 160 160 255;
}
description { state: "pressed" 0.0;
@@ -1335,13 +1323,13 @@ IC("ic-arrow-d", "arrow-d")
parts {
part { name: "arrow.image";
description { state: "default" 0.0;
- image.normal: "ic-arrow-l";
+ image.normal: "i-arrow-l";
}
description { state: "pressed" 0.0;
- image.normal: "ic-arrow-l";
+ image.normal: "i-arrow-l";
}
description { state: "disabled" 0.0;
- image.normal: "ic-arrow-l";
+ image.normal: "i-arrow-l";
}
}
}
@@ -1424,13 +1412,13 @@ IC("ic-arrow-d", "arrow-d")
parts {
part { name: "arrow.image";
description { state: "default" 0.0;
- image.normal: "ic-arrow-u";
+ image.normal: "i-arrow-u";
}
description { state: "pressed" 0.0;
- image.normal: "ic-arrow-u";
+ image.normal: "i-arrow-u";
}
description { state: "disabled" 0.0;
- image.normal: "ic-arrow-u";
+ image.normal: "i-arrow-u";
}
}
}
@@ -1445,13 +1433,13 @@ IC("ic-arrow-d", "arrow-d")
parts {
part { name: "arrow.image";
description { state: "default" 0.0;
- image.normal: "ic-arrow-d";
+ image.normal: "i-arrow-d";
}
description { state: "pressed" 0.0;
- image.normal: "ic-arrow-d";
+ image.normal: "i-arrow-d";
}
description { state: "disabled" 0.0;
- image.normal: "ic-arrow-d";
+ image.normal: "i-arrow-d";
}
}
}
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";
parts {
part { name: "bg";
description { state: "default" 0.0;
- color: DARK_GREY_BG_COLOR;
+ color: 48 48 48 255;
}
}
part { name: "validation_glow"; type: RECT; mouse_events: 0;
@@ -40,9 +40,8 @@ group { name: "elm/scroller/entry/default";
insert_before: "elm.swallow.content";
scale: 1;
description { state: "default" 0.0;
- rel1.to: "bg";
+ rel.to: "bg";
rel1.relative: 0.0 1.0;
- rel2.to: "bg";
rel1.offset: 0 0;
color: 51 153 255 0;
visible: 0;
@@ -55,26 +54,27 @@ group { name: "elm/scroller/entry/default";
visible: 1;
}
}
- program {
- signal: "elm,action,focus_highlight,show"; source: "elm";
+ program { signal: "elm,action,focus_highlight,show"; source: "elm";
action: STATE_SET "focused" 0.0;
transition: DECELERATE 0.3;
target: "glow";
}
- program {
- signal: "elm,action,focus_highlight,hide"; source: "elm";
+ program { signal: "elm,action,focus_highlight,hide"; source: "elm";
action: STATE_SET "default" 0.0;
transition: DECELERATE 0.3;
target: "glow";
}
part { name: "elm.swallow.content";
+ scale: 1;
+ clip_to: "clipper";
description { state: "default" 0.0;
- rel1.to: "elm.swallow.icon";
+ rel1.to_x: "elm.swallow.icon";
rel1.relative: 1.0 0.0;
- rel1.offset: 0 0;
- rel2.to: "elm.swallow.end";
+ rel1.offset: 2 2;
+ rel2.to_x: "elm.swallow.end";
rel2.relative: 0.0 1.0;
- rel2.offset: -1 -1;
+ rel2.offset: -3 -3;
+ offscale;
}
}
part { name: "elm.swallow.icon"; type: SWALLOW;
@@ -82,10 +82,9 @@ group { name: "elm/scroller/entry/default";
scale: 1;
description { state: "default" 0.0;
fixed: 1 1;
- rel1.to: "bg";
- rel1.offset: 0 2;
- rel2.to: "bg";
- rel2.offset: 0 -3;
+ rel.to: "bg";
+ rel1.offset: -1 2;
+ rel2.offset: -1 -3;
rel2.relative: 0.0 1.0;
visible: 0;
align: 0.0 0.5;
@@ -101,13 +100,11 @@ group { name: "elm/scroller/entry/default";
aspect: 1.0 1.0;
}
}
- program {
- signal: "elm,action,show,icon"; source: "elm";
+ program { signal: "elm,action,show,icon"; source: "elm";
action: STATE_SET "visible" 0.0;
target: "elm.swallow.icon";
}
- program {
- signal: "elm,action,hide,icon"; source: "elm";
+ program { signal: "elm,action,hide,icon"; source: "elm";
action: STATE_SET "default" 0.0;
target: "elm.swallow.icon";
}
@@ -116,10 +113,9 @@ group { name: "elm/scroller/entry/default";
scale: 1;
description { state: "default" 0.0;
fixed: 1 1;
- rel1.to: "bg";
+ rel.to: "bg";
rel1.offset: 0 2;
rel1.relative: 1.0 0.0;
- rel2.to: "bg";
rel2.offset: 0 -3;
visible: 0;
align: 1.0 0.5;
@@ -135,13 +131,11 @@ group { name: "elm/scroller/entry/default";
aspect: 1.0 1.0;
}
}
- program {
- signal: "elm,action,show,end"; source: "elm";
+ program { signal: "elm,action,show,end"; source: "elm";
action: STATE_SET "visible" 0.0;
target: "elm.swallow.end";
}
- program {
- signal: "elm,action,hide,end"; source: "elm";
+ program { signal: "elm,action,hide,end"; source: "elm";
action: STATE_SET "default" 0.0;
target: "elm.swallow.end";
}
@@ -201,10 +195,8 @@ group { name: "elm/scroller/entry_single/default";
}
part { name: "bg"; type: RECT;
description { state: "default" 0.0;
- rel1.to: "elm.swallow.background";
- rel2.to: "elm.swallow.background";
- color: DARK_GREY_BG_COLOR;
- color_class: "scroller_bg";
+ rel.to: "elm.swallow.background";
+ color: 48 48 48 255;
}
}
part { name: "elm.swallow.background"; type: SWALLOW;
@@ -226,9 +218,8 @@ group { name: "elm/scroller/entry_single/default";
part { name: "glow"; type: RECT; mouse_events: 0;
scale: 1;
description { state: "default" 0.0;
- rel1.to: "bg";
+ rel.to: "bg";
rel1.relative: 0.0 1.0;
- rel2.to: "bg";
rel1.offset: 0 0;
color: 51 153 255 0;
visible: 0;
@@ -241,14 +232,12 @@ group { name: "elm/scroller/entry_single/default";
visible: 1;
}
}
- program {
- signal: "elm,action,focus_highlight,show"; source: "elm";
+ program { signal: "elm,action,focus_highlight,show"; source: "elm";
action: STATE_SET "focused" 0.0;
transition: DECELERATE 0.2;
target: "glow";
}
- program {
- signal: "elm,action,focus_highlight,hide"; source: "elm";
+ program { signal: "elm,action,focus_highlight,hide"; source: "elm";
action: STATE_SET "default" 0.0;
transition: DECELERATE 0.2;
target: "glow";
@@ -271,6 +260,7 @@ group { name: "elm/scroller/entry_single/default";
scale: 1;
clip_to: "clipper";
description { state: "default" 0.0;
+ fixed: 1 1;
rel2.relative: 0.0 1.0;
rel1.offset: -1 2;
rel2.offset: -1 -3;
@@ -288,13 +278,11 @@ group { name: "elm/scroller/entry_single/default";
aspect: 1.0 1.0;
}
}
- program {
- signal: "elm,action,show,icon"; source: "elm";
+ program { signal: "elm,action,show,icon"; source: "elm";
action: STATE_SET "visible" 0.0;
target: "elm.swallow.icon";
}
- program {
- signal: "elm,action,hide,icon"; source: "elm";
+ program { signal: "elm,action,hide,icon"; source: "elm";
action: STATE_SET "default" 0.0;
target: "elm.swallow.icon";
}
@@ -303,6 +291,7 @@ group { name: "elm/scroller/entry_single/default";
scale: 1;
clip_to: "clipper";
description { state: "default" 0.0;
+ fixed: 1 1;
rel1.relative: 1.0 0.0;
rel1.offset: 0 2;
rel2.offset: 0 -3;
@@ -320,13 +309,11 @@ group { name: "elm/scroller/entry_single/default";
aspect: 1.0 1.0;
}
}
- program {
- signal: "elm,action,show,end"; source: "elm";
+ program { signal: "elm,action,show,end"; source: "elm";
action: STATE_SET "visible" 0.0;
target: "elm.swallow.end";
}
- program {
- signal: "elm,action,hide,end"; source: "elm";
+ program { signal: "elm,action,hide,end"; source: "elm";
action: STATE_SET "default" 0.0;
target: "elm.swallow.end";
}
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";
description { state: "default" 0.0;
aspect: 1.0 1.0; aspect_preference: BOTH;
rel.to: "icon_area";
- image.normal: "efm_folder_icon";
+ image.normal: "i-folder";
}
}
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";
}
}
-#define IC(_NAME, _ICON) \
- set { name: _NAME; \
- image {image: _ICON"-060.png" COMP; size: 31 31 60000 60000; } \
- image {image: _ICON"-030.png" COMP; size: 16 16 30 30; } \
- image {image: _ICON"-015.png" COMP; size: 0 0 15 15; } \
- }
-IC("ic-arrow-l", "arrow-l")
-IC("ic-arrow-r", "arrow-r")
-IC("ic-arrow-u", "arrow-u")
-IC("ic-arrow-d", "arrow-d")
-IC("ic-reload", "reload")
-IC("ic-heart", "heart")
-#undef IC
-
group { name: "elm/panel/left/default";
data.item: "focus_highlight" "on";
script {
@@ -456,11 +442,11 @@ group { name: "elm/panel/left/default";
fixed: 1 1;
min: 30 30; max: 30 30;
rel.to: "btn";
- image.normal: "ic-arrow-l";
+ image.normal: "i-arrow-l";
}
description { state: "hidden" 0.0;
inherit: "default" 0.0;
- image.normal: "ic-arrow-r";
+ image.normal: "i-arrow-r";
}
}
}
@@ -631,10 +617,10 @@ group { name: "elm/panel/right/default";
}
part { name: "icn";
description { state: "default" 0.0;
- image.normal: "ic-arrow-r";
+ image.normal: "i-arrow-r";
}
description { state: "hidden" 0.0;
- image.normal: "ic-arrow-l";
+ image.normal: "i-arrow-l";
}
}
}
@@ -681,10 +667,10 @@ group { name: "elm/panel/top/default";
}
part { name: "icn";
description { state: "default" 0.0;
- image.normal: "ic-arrow-u";
+ image.normal: "i-arrow-u";
}
description { state: "hidden" 0.0;
- image.normal: "ic-arrow-d";
+ image.normal: "i-arrow-d";
}
}
}
@@ -765,10 +751,10 @@ group { name: "elm/panel/bottom/default";
}
part { name: "icn";
description { state: "default" 0.0;
- image.normal: "ic-arrow-d";
+ image.normal: "i-arrow-d";
}
description { state: "hidden" 0.0;
- image.normal: "ic-arrow-u";
+ image.normal: "i-arrow-u";
}
}
}
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";
image: "pointer.png" COMP;
}
parts {
- part {
- name: "base";
+ part { name: "base";
mouse_events: 0;
- description {
- state: "default" 0.0;
+ scale: 1;
+ description { state: "default" 0.0;
aspect: 1.0 1.0;
min: 32 32;
/* force a specific aspect ratio so
@@ -22,45 +21,36 @@ group { name: "elm/pointer/base/default";
}
}
}
- part {
- name: "elm.swallow.hotspot";
+ part { name: "elm.swallow.hotspot"; type: SWALLOW;
/* this is a "fake" swallow part
* that is used by e to determine
* the pointer hotspot - or where
* the actual mouse events get
* reported from on the cursor */
- type: SWALLOW;
- description {
- state: "default" 0.0;
+ description { state: "default" 0.0;
visible: 0;
fixed: 1 1;
- rel1 {
+ rel1 { to: "base";
/* the hotspot will scale with the cursor here */
- to: "base";
relative: 0.1875 0.1875;
offset: 0 0;
}
- rel2 {
- to: "base";
+ rel2 { to: "base";
relative: 0.1875 0.1875;
offset: 0 0;
}
}
}
}
- programs {
- }
}
group { name: "elm/pointer/base/bottom_right_corner";
inherit: "elm/pointer/base/default";
- images.image: "mini_box_glow.png" COMP;
parts {
- part { name: "box";
+ part { name: "box"; type: RECT;
insert_after: "base";
description { state: "default" 0.0;
- image.normal: "mini_box_glow.png";
- image.border: 7 7 7 7;
+ color: 51 153 255 192;
rel1.relative: 0.3 0.3;
rel2.relative: 0.7 0.7;
}
@@ -202,13 +192,11 @@ group { name: "elm/pointer/base/right_side";
group { name: "elm/pointer/base/hand1";
inherit: "elm/pointer/base/default";
- images.image: "mini_box_glow.png" COMP;
parts {
- part { name: "box";
+ part { name: "box"; type: RECT;
insert_after: "base";
description { state: "default" 0.0;
- image.normal: "mini_box_glow.png";
- image.border: 7 7 7 7;
+ color: 51 153 255 192;
rel1.relative: 0.5 0.5;
rel2.relative: 1.0 1.0;
}
@@ -277,13 +265,11 @@ group { name: "elm/pointer/base/move";
group { name: "elm/pointer/base/rotate";
inherit: "elm/pointer/base/default";
- images.image: "mini_box_glow.png" COMP;
parts {
- part { name: "box";
+ part { name: "box"; type: RECT;
insert_after: "base";
description { state: "default" 0.0;
- image.normal: "mini_box_glow.png";
- image.border: 7 7 7 7;
+ color: 51 153 255 192;
rel1.relative: 0.3 0.3;
rel2.relative: 0.8 0.8;
map.on: 1;
@@ -361,39 +347,26 @@ group { name: "elm/pointer/base/plus";
}
group { name: "elm/pointer/base/xterm";
- images.image: "therm_base.png" COMP;
- images.image: "led_dot_white.png" COMP;
+ images.image: "pointer_entry.png" COMP;
parts {
part { name: "base";
+ scale: 1;
description { state: "default" 0.0;
- image.normal: "therm_base.png";
- max: 15 99999;
- min: 15 20;
- image.normal: "therm_base.png";
- image.border: 0 0 10 10;
- rel1.offset: 0 2;
- rel2.offset: -1 -3;
+ image.normal: "pointer_entry.png";
+ aspect: (44/88) (44/88); aspect_preference: VERTICAL;
+ FIXED_SIZE(32, 32)
}
}
part { name: "elm.swallow.hotspot"; type: SWALLOW;
description { state: "default" 0.0;
fixed: 1 1;
visible: 0;
- rel1.relative: 0.5 0.5;
rel1.to: "base";
+ rel1.relative: 0.5 0.5;
rel2.to: "base";
rel2.relative: 0.5 0.5;
rel2.offset: 0 0;
}
}
- part { name: "shine";
- description { state: "default" 0.0;
- rel1.to: "base";
- rel2.to: "base";
- image.normal: "led_dot_white.png";
- max: 27 27;
- aspect: 1.0 1.0; aspect_preference: VERTICAL;
- }
- }
}
}
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 @@
// === toolbar default base with scrolling arrows etc.
-#define IC(_NAME, _ICON) \
-set { name: _NAME; \
-image {image: _ICON"-060.png" COMP; size: 31 31 60000 60000; } \
-image {image: _ICON"-030.png" COMP; size: 16 16 30 30; } \
-image {image: _ICON"-015.png" COMP; size: 0 0 15 15; } \
-}
-IC("ic-arrow-l", "arrow-l")
-IC("ic-arrow-r", "arrow-r")
-IC("ic-arrow-u", "arrow-u")
-IC("ic-arrow-d", "arrow-d")
-IC("ic-reload", "reload")
-IC("ic-heart", "heart")
-#undef IC
-
group { name: "elm/toolbar/base/default";
parts {
part { name: "base"; type: RECT;
@@ -61,7 +47,7 @@ group { name: "elm/toolbar/base/default";
description { state: "default" 0.0;
fixed: 1 1;
rel.to: "arrow_l_ev";
- image.normal: "ic-arrow-l";
+ image.normal: "i-arrow-l";
FIXED_SIZE(15, 15)
color: 160 160 160 255;
}
@@ -101,7 +87,7 @@ group { name: "elm/toolbar/base/default";
description { state: "default" 0.0;
fixed: 1 1;
rel.to: "arrow_r_ev";
- image.normal: "ic-arrow-r";
+ image.normal: "i-arrow-r";
FIXED_SIZE(15, 15)
color: 160 160 160 255;
}
@@ -141,7 +127,7 @@ group { name: "elm/toolbar/base/default";
description { state: "default" 0.0;
fixed: 1 1;
rel.to: "arrow_u_ev";
- image.normal: "ic-arrow-u";
+ image.normal: "i-arrow-u";
FIXED_SIZE(15, 15)
color: 160 160 160 255;
}
@@ -181,7 +167,7 @@ group { name: "elm/toolbar/base/default";
description { state: "default" 0.0;
fixed: 1 1;
rel.to: "arrow_d_ev";
- image.normal: "ic-arrow-d";
+ image.normal: "i-arrow-d";
FIXED_SIZE(15, 15)
color: 160 160 160 255;
}
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 @@
-#define IC(_NAME, _ICON) \
-set { name: _NAME; \
- image {image: _ICON"-060.png" COMP; size: 31 31 60000 60000; } \
- image {image: _ICON"-030.png" COMP; size: 16 16 30 30; } \
- image {image: _ICON"-015.png" COMP; size: 0 0 15 15; } \
-}
-IC("ic-arrow-l", "arrow-l")
-IC("ic-arrow-r", "arrow-r")
-IC("ic-arrow-u", "arrow-u")
-IC("ic-arrow-d", "arrow-d")
-IC("ic-reload", "reload")
-IC("ic-heart", "heart")
-#undef IC
-
group { name: "e/fileman/default/list/variable";
alias: "e/fileman/default/list/fixed";
// data.item: "stacking" "above";
@@ -1070,7 +1056,7 @@ group { name: "e/fileman/default/list/drop_in";
align: 0.5 0.0;
rel1.relative: 0.0 -1.0;
rel2.relative: 1.0 0.0;
- image.normal: "ic-arrow-d";
+ image.normal: "i-arrow-d";
FIXED_SIZE(15, 15)
color: 51 153 255 255;
visible: 0;
@@ -1094,7 +1080,7 @@ group { name: "e/fileman/default/list/drop_in";
align: 0.5 1.0;
rel1.relative: 0.0 1.0;
rel2.relative: 1.0 2.0;
- image.normal: "ic-arrow-u";
+ image.normal: "i-arrow-u";
FIXED_SIZE(15, 15)
color: 51 153 255 255;
visible: 0;
@@ -1170,7 +1156,7 @@ group { name: "e/fileman/default/list/drop_between";
align: 0.5 0.0;
rel1.offset: 0 -40;
rel2.relative: 1.0 0.0;
- image.normal: "ic-arrow-d";
+ image.normal: "i-arrow-d";
FIXED_SIZE(15, 15)
color: 51 153 255 255;
visible: 0;
@@ -1195,7 +1181,7 @@ group { name: "e/fileman/default/list/drop_between";
align: 0.5 1.0;
rel1.relative: 0.0 1.0;
rel2.offset: -1 39;
- image.normal: "ic-arrow-u";
+ image.normal: "i-arrow-u";
FIXED_SIZE(15, 15)
color: 51 153 255 255;
visible: 0;
@@ -1526,7 +1512,7 @@ group { name: "e/modules/efm_navigation/main";
description { state: "default" 0.0; \
rel1.to: _REL; \
rel2.to: _REL; \
- image.normal: "ic-"_ICON; \
+ image.normal: "i-"_ICON; \
min: 15 15; \
max: 15 15; \
fixed: 1 1; \
@@ -1718,7 +1704,7 @@ group { name:
"e/modules/efm_navigation/pathbar_scrollframe";
scale: 1;
description { state: "default" 0.0;
rel.to: "arrow1_ev";
- image.normal: "ic-arrow-l";
+ image.normal: "i-arrow-l";
FIXED_SIZE(15, 15)
color: 160 160 160 255;
}
@@ -1741,7 +1727,7 @@ group { name:
"e/modules/efm_navigation/pathbar_scrollframe";
scale: 1;
description { state: "default" 0.0;
rel.to: "arrow2_ev";
- image.normal: "ic-arrow-r";
+ image.normal: "i-arrow-r";
FIXED_SIZE(15, 15)
color: 160 160 160 255;
}
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 @@
-#define ICON(_NAME, _SIZE, _FILE) \
- group { \
- name: "e/icons/"_NAME; \
- max: _SIZE _SIZE; \
+#define ICON(_NAME, _FILE) \
+ group { name: "e/icons/"_NAME; \
parts { \
part { name: "icon"; mouse_events: 0; \
description { state: "default" 0.0; \
- max: _SIZE _SIZE; \
aspect: 1.0 1.0; aspect_preference: BOTH; \
image.image: _FILE COMP; \
image.normal: _FILE; \
@@ -14,93 +11,79 @@
} \
}
- ICON("system", 80, "icon_system.png")
- ICON("system-shutdown", 80,
"icon_system-shutdown.png")
- ICON("system-restart", 80,
"icon_system-restart.png")
- ICON("system-suspend", 80,
"icon_system-suspend.png")
- ICON("system-suspend-hibernate", 80,
"icon_system-suspend-hibernate.png")
- ICON("system-log-out", 80,
"icon_system-log-out.png")
- ICON("system-lock-screen", 80,
"icon_system-lock-screen.png")
- ICON("application-exit", 80,
"icon_system-log-out.png")
- ICON("enlightenment", 80, "icon_enlightenment.png")
- ICON("help-about", 80, "icon_enlightenment.png")
- ICON("preferences-desktop-environments", 80,
"icon_preferences-desktop-environments.png")
- ICON("preferences-applications-screen-lock", 80,
"icon_preferences-applications-screen-lock.png")
- ICON("preferences-applications-screen-unlock", 80,
"icon_preferences-applications-screen-unlock.png")
- ICON("preferences-applications-personal", 80,
"icon_preferences-applications-personal.png")
- ICON("preferences-desklock-locale", 80,
"icon_preferences-desklock-locale.png")
- ICON("preferences-desktop-signal-bindings", 80,
"icon_preferences-desktop-signal-bindings.png")
- ICON("preferences-variables", 80,
"icon_preferences-variables.png")
- ICON("preferences-interaction", 80,
"icon_preferences-interaction.png")
- ICON("preferences-composite", 80,
"icon_preferences-composite.png")
+ ICON("system", "icon_system.png")
+ ICON("system-shutdown", "icon_system-shutdown.png")
+ ICON("system-restart", "icon_system-restart.png")
+ ICON("system-suspend", "icon_system-suspend.png")
+ ICON("system-suspend-hibernate",
"icon_system-suspend-hibernate.png")
+ ICON("system-log-out", "icon_system-log-out.png")
+ ICON("system-lock-screen",
"icon_system-lock-screen.png")
+ ICON("application-exit", "icon_system-log-out.png")
+ ICON("enlightenment", "icon_enlightenment.png")
+ ICON("help-about", "icon_enlightenment.png")
+ ICON("preferences-desktop-environments",
"icon_preferences-desktop-environments.png")
+ ICON("preferences-applications-screen-lock",
"icon_preferences-applications-screen-lock.png")
+ ICON("preferences-applications-screen-unlock",
"icon_preferences-applications-screen-unlock.png")
+ ICON("preferences-applications-personal",
"icon_preferences-applications-personal.png")
+ ICON("preferences-desklock-locale",
"icon_preferences-desklock-locale.png")
+ ICON("preferences-desktop-signal-bindings",
"icon_preferences-desktop-signal-bindings.png")
+ ICON("preferences-variables",
"icon_preferences-variables.png")
+ ICON("preferences-interaction",
"icon_preferences-interaction.png")
+ ICON("preferences-composite",
"icon_preferences-composite.png")
- ICON("enlightenment/wallpaper_stretch", 80,
"icon_wallpaper_stretch.png")
- ICON("enlightenment/wallpaper_center", 80,
"icon_wallpaper_center.png")
- ICON("enlightenment/wallpaper_tile", 80,
"icon_wallpaper_tile.png")
- ICON("enlightenment/wallpaper_scale_aspect_in", 80,
"icon_wallpaper_within.png")
- ICON("enlightenment/wallpaper_scale_aspect_out", 80,
"icon_wallpaper_fill.png")
- ICON("enlightenment/wallpaper_pan", 80,
"icon_wallpaper_pan.png")
-#if 0
-// ICON("", 80, "")
-#endif
+ ICON("enlightenment/wallpaper_stretch",
"icon_wallpaper_stretch.png")
+ ICON("enlightenment/wallpaper_center",
"icon_wallpaper_center.png")
+ ICON("enlightenment/wallpaper_tile", "icon_wallpaper_tile.png")
+ ICON("enlightenment/wallpaper_scale_aspect_in",
"icon_wallpaper_within.png")
+ ICON("enlightenment/wallpaper_scale_aspect_out", "icon_wallpaper_fill.png")
+ ICON("enlightenment/wallpaper_pan", "icon_wallpaper_pan.png")
#undef ICON
// regular icons
-#define ICON(_NAME, _FILE) \
- set { name: _FILE"_icon"; \
- image { image: _FILE"_160.png" COMP; size: 81 81 16000 16000; } \
- image { image: _FILE"_080.png" COMP; size: 41 41 80 80; } \
- image { image: _FILE"_040.png" COMP; size: 0 0 40 40; } \
- } \
- group { \
- name: "e/icons/"_NAME; \
- max: 16000 16000; \
+#define ICON(_NAME, _ICON) \
+ group { name: "e/icons/"_NAME; \
parts { \
part { name: "icon"; mouse_events: 0; \
description { state: "default" 0.0; \
aspect: 1.0 1.0; aspect_preference: BOTH; \
- image.normal: _FILE"_icon"; \
+ image.normal: _ICON; \
} \
} \
} \
}
- ICON("modules-files", "efm_folder")
- ICON("system-file-manager", "efm_folder")
- ICON("folder", "efm_folder")
- ICON("folder-image", "efm_folder")
- ICON("inode/directory", "efm_folder")
- ICON("user-home", "efm_home")
- ICON("user-desktop", "efm_desktop")
- ICON("user-temp", "efm_temp")
- ICON("user-bookmarks", "efm_favorite")
- ICON("computer", "efm_computer")
- ICON("drive-optical", "efm_drive_cd")
- ICON("drive-harddisk", "efm_drive_hdd")
- ICON("drive-removable-media", "efm_drive_usb_media")
- ICON("media-flash", "efm_drive_flash")
- ICON("dialog-ask", "ic_unknown")
- ICON("unknown", "ic_unknown")
- ICON("emblem-symbolic-link", "ic_unknown")
+ ICON("modules-files", "i-folder")
+ ICON("system-file-manager", "i-folder")
+ ICON("folder", "i-folder")
+ ICON("folder-image", "i-folder")
+ ICON("inode/directory", "i-folder")
+ ICON("user-home", "i-home")
+ ICON("user-desktop", "i-desktop")
+ ICON("user-temp", "i-temp")
+ ICON("user-bookmarks", "i-favorite")
+ ICON("computer", "i-computer")
+ ICON("drive-optical", "i-drive-cd")
+ ICON("drive-harddisk", "i-drive-hdd")
+ ICON("drive-removable-media", "i-drive-usb-media")
+ ICON("media-flash", "i-drive-flash")
+
+ ICON("dialog-ask", "i-unknown")
+ ICON("unknown", "i-unknown")
+ ICON("emblem-symbolic-link", "i-unknown")
#undef ICON
+
// mime icons
-#define ICON(_NAME, _FILE) \
- set { name: _FILE"_icon"; \
- image { image: _FILE"_160.png" COMP; size: 81 81 16000 16000; } \
- image { image: _FILE"_080.png" COMP; size: 41 41 80 80; } \
- image { image: _FILE"_040.png" COMP; size: 0 0 40 40; } \
- } \
- group { \
- name: "e/icons/fileman/mime/"_NAME; \
- max: 16000 16000; \
+#define ICON(_NAME, _ICON) \
+ group { name: "e/icons/fileman/mime/"_NAME; \
parts { \
part { name: "icon"; mouse_events: 0; \
description { state: "default" 0.0; \
aspect: 1.0 1.0; aspect_preference: BOTH; \
- image.normal: _FILE"_icon"; \
+ image.normal: _ICON; \
} \
} \
} \
}
- ICON("inode/directory", "efm_folder")
+
+ ICON("inode/directory", "i-folder")
#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 @@
group { name: "e/modules/start/main";
alias: "e/gadget/start/main";
- images.image: "big_arrow_down.png" COMP;
- images.image: "big_arrow_up.png" COMP;
- images.image: "big_arrow_left.png" COMP;
- images.image: "big_arrow_right.png" COMP;
- max: 128 128;
parts {
part { name: "arrow_base"; type: RECT;
description { state: "default" 0.0;
@@ -20,28 +15,22 @@ group { name: "e/modules/start/main";
part { name: "arrow";
clip_to: "arrow_base";
description { state: "default" 0.0;
- image.normal: "big_arrow_up.png";
- aspect: (17/14) (17/14);
- max: 17 14;
+ image.normal: "i-arrow-u";
color: 160 160 160 255;
+ rel1.relative: (4/40) (4/40);
+ rel2.relative: (36/40) (36/40);
}
description { state: "down" 0.0;
inherit: "default" 0.0;
- image.normal: "big_arrow_down.png";
- aspect: (17/14) (17/14);
- max: 17 14;
+ image.normal: "i-arrow-d";
}
description { state: "left" 0.0;
inherit: "default" 0.0;
- image.normal: "big_arrow_left.png";
- aspect: (14/17) (14/17);
- max: 14 17;
+ image.normal: "i-arrow-l";
}
description { state: "right" 0.0;
inherit: "default" 0.0;
- image.normal: "big_arrow_right.png";
- aspect: (14/17) (14/17);
- max: 14 17;
+ image.normal: "i-arrow-r";
}
}
part { name: "events"; type: RECT;
@@ -51,15 +40,11 @@ group { name: "e/modules/start/main";
}
}
programs {
- program {
- signal: "e,state,focused";
- source: "e";
+ program { signal: "e,state,focused"; source: "e";
action: STATE_SET "active" 0.0;
target: "arrow_base";
}
- program {
- signal: "e,state,unfocused";
- source: "e";
+ program { signal: "e,state,unfocused"; source: "e";
action: STATE_SET "default" 0.0;
target: "arrow_base";
}
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 @@
+// master file defining all the icon images and image sets for multiple
+// sizes to use optimal memory or decode less
+///////////////////////////////////////////////////////////////////////////////
+// larger icons
+// 160, 80, 40
+#define I160(_NAME, _FILE) \
+ set { name: _NAME""; \
+ image { image: "ic/"_FILE"-160.png" COMP; size: 81 81 16000 16000; } \
+ image { image: "ic/"_FILE"-080.png" COMP; size: 41 41 80 80; } \
+ image { image: "ic/"_FILE"-040.png" COMP; size: 0 0 40 40; } \
+ }
+// smaller icons
+// 60, 30, 15
+#define I060(_NAME, _FILE) \
+ set { name: _NAME; \
+ image { image: "ic/"_FILE"-060.png" COMP; size: 31 31 60000 60000; } \
+ image { image: "ic/"_FILE"-030.png" COMP; size: 16 16 30 30; } \
+ image { image: "ic/"_FILE"-015.png" COMP; size: 0 0 15 15; } \
+ }
+
+///////////////////////////////////////////////////////////////////////////////
+// smaller monocrhome icons
+I060("i-arrow-l", "arrow-l")
+I060("i-arrow-r", "arrow-r")
+I060("i-arrow-u", "arrow-u")
+I060("i-arrow-d", "arrow-d")
+I060("i-reload", "reload")
+I060("i-heart", "heart")
+I060("i-close", "close")
+// close
+// lock
+// lock double
+// unlocked
+// exclam
+// apps
+// everything
+// screenshot
+// camera
+// folder
+// desktop
+// windows
+// enlightenment
+// spanner
+// system
+// border
+// kill
+// maximize
+// minimize
+// more
+// move
+// pager
+// pin
+// properties
+// remember
+// resize
+// send to
+// shaded
+// skip
+// stack bottom
+// stack norm
+// stack top
+// chat
+// check
+// clock
+// delete
+// edit
+// eject
+// file
+// ff
+// rw
+// next
+// prev
+// stop
+// play
+// pause
+// head
+// info
+// mute
+// sound/volume
+// search
+// pair
+// unpair
+// auto lock
+// no lock
+// auto connect
+// manual connect
+// connect
+// disconnect
+// trust
+// untrust
+// pair
+// unpair
+// more
+// cancel
+// sys lock
+// sys halt
+// sys reboot
+// sys suspend
+// sys hibernate
+// sys lgout
+// system
+// center
+// fill
+// pan
+// stretch
+// tile
+// fit inside
+// warning
+// keyboard
+// mouse
+// touch
+// upload
+// download
+// up+download
+// battery
+// power
+// network
+// ethernet
+// bt
+// wifi
+// temp
+// tile float
+// tile h
+// tile v
+// package
+// bug
+// enhance
+// pri low
+// pri med
+// pri hi
+// hand
+// pointer
+// plus
+// minus
+// ban
+// screen
+// op ask
+// op copy
+// op move
+// rocket
+// kbd+mouse
+// palette
+// font
+// top
+// bottom
+// left
+// right
+// top left
+// top center
+// top right
+// bottom left
+// bottom center
+// bottom right
+// left top
+// left center
+// left bottom
+// right top
+// right center
+// right bottom
+// question
+// key
+// moon
+// paintbrush
+// chip
+// mic
+// bulb
+// bright bulb
+// phone
+
+///////////////////////////////////////////////////////////////////////////////
+// larger color icons (mostly efm or settings)
+I160("i-computer", "efm-computer")
+I160("i-desktop", "efm-desktop")
+I160("i-drive-cd", "efm-drive-cd")
+I160("i-drive-flash", "efm-drive-flash")
+I160("i-drive-hdd", "efm-drive-hdd")
+I160("i-drive-usb-media", "efm-drive-usb-media")
+I160("i-favorite", "efm-favorite")
+I160("i-folder", "efm-folder")
+I160("i-home", "efm-home")
+I160("i-temp", "efm-temp")
+
+I160("i-system-shutdown", "system-shutdown")
+I160("i-system-suspend", "system-suspend")
+
+///////////////////////////////////////////////////////////////////////////////
+// misc larger icons
+I160("i-unknown", "unknown")
+
+
+
+
+
+
+
+
+
+// need to do
+#if 0
+# define ICON(NAME, FILE, SIZE) \
+ group { name: "e/icons/"NAME ; \
+ max: SIZE SIZE; \
+ parts { \
+ part { name: "icon"; repeat_events: 1; \
+ description { state: "default" 0.0; \
+ aspect: 1.0 1.0; aspect_preference: BOTH; \
+ image.image: "O/"FILE COMP; \
+ image.normal: "O/"FILE ; \
+ } \
+ } \
+ } \
+ }
+# define ICONMIME(NAME, FILE, SIZE) ICON("mimetypes/"NAME, FILE, SIZE)
+ ICON("list-add","icon_add.png",64) //
"widget/add"
+ ICON("list-remove","icon_del.png",64) //
"widget/del"
+ ICON("go-up","icon_up_arrow.png",64) //
"widget/up_arrow" "widget/up_dir"
+ ICON("go-down","icon_down_arrow.png",64) //
"widget/down_arrow"
+ ICON("go-next","icon_right_arrow.png",64) //
"widget/new_dialog"
+ ICON("go-previous","icon_left_arrow.png",64) // none
+ ICON("bookmark-new","icon_add_fav.png",64) //
"widget/add_fav"
+ ICON("edit-swap","icon_swap.png",64) // *** //
"widget/swap"
+ ICON("edit-copy","icon_efm_copy.png",16) //
EFMBUTTON("copy"
+ ICON("edit-cut","icon_efm_cut.png",16) //
EFMBUTTON("cut"
+ ICON("edit-paste","icon_efm_paste.png",16) //
EFMBUTTON("paste"
+ ICON("edit-delete","icon_efm_delete.png",16) //
EFMBUTTON("delete"
+ ICON("edit-rename","icon_efm_rename.png",16) //
EFMBUTTON("rename"
+ ICON("edit-select-all","icon_efm_select.png",16) //
EFMBUTTON("select"
+ ICON("document-open","icon_efm_open.png",16) //
"widget/open" EFMBUTTON("open") EFMBUTTON("new")
+ ICON("document-new","icon_new.png",64) //
"widget/new"
+ ICON("document-properties","icon_efm_properties.png",16) //
EFMBUTTON("properties"
+ ICON("folder-new","icon_efm_new_dir.png",16) //
EFMBUTTON("new_dir"
+ ICON("view-sort","icon_efm_sort.png",16) // *** //
EFMBUTTON("sort",
+ ICON("view-order","icon_efm_sort.png",16) // *** //
EFMBUTTON("ordering"
+ ICON("view-hidden-files","icon_efm_view.png",16) // *** //
EFMBUTTON("hidden_files"
+ ICON("configure","icon_config.png",64) //
"widget/config"
+ ICON("system-run","icon_run.png",64) //
"enlightenment/run"
+ ICON("window-close","icon_close.png",64) //
"widget/close"
+ ICON("dialog-ok-apply","icon_check.png",64) //
"enlightenment/check"
+ ICON("transform-scale","icon_resize.png",64) //
"widget/resize"
+ ICON("transform-move","icon_autoscroll.png",64) //
"enlightenment/autoscroll"
+ ICON("view-refresh","icon_reset.png",16) //
EFMBUTTON("refresh"
+ ICON("view-inherit","icon_dummy.png",64) // *** //
EFMBUTTON("inherit"
+ ICON("screenshot","icon_screenshot.png",64) // dunno
+ ICON("dialog-warning","icon_warning.png",128) //
"enlightenment/warning"
+ ICON("dialog-error","icon_warning.png",128) //
"enlightenment/error"
+ ICON("preferences-desktop","icon_desktops.png",64)
// "enlightenment/desktops"
+ ICON("preferences-desktop-theme","icon_theme.png",64)
// "enlightenment/themes"
+ ICON("preferences-desktop-wallpaper","icon_wallpaper.png",64)
// "enlightenment/background"
+ ICON("preferences-desktop-color","icon_colors.png",64)
// "enlightenment/colors"
+ ICON("preferences-desktop-font","icon_fonts.png",64)
// "enlightenment/fonts"
+ ICON("preferences-desktop-screensaver","icon_screensaver.png",64)
// "enlightenment/screensaver"
+ ICON("preferences-desktop-display","icon_screen_setup.png",64)
// "enlightenment/screen_setup"
+ ICON("preferences-desktop-keyboard","icon_keyboard.png",64)
// "enlightenment/keys"
+ ICON("preferences-desktop-keyboard-shortcuts","icon_keys.png",64)
// "enlightenment/keys"
+ ICON("preferences-desktop-pointer","icon_mouse.png",64) // ***
// "enlightenment/mouse"
+ ICON("preferences-desktop-mouse","icon_mouse_clean.png",64)
// "enlightenment/mouse_clean"
+ ICON("preferences-desktop-mouse-left","icon_mouse_left.png",64) // ***
// "enlightenment/mouse_left"
+ ICON("preferences-desktop-mouse-right","icon_mouse_right.png",64) // ***
// "enlightenment/mouse_right"
+ ICON("preferences-desktop-mouse-middle","icon_mouse_middle.png",64) // ***
// "enlightenment/mouse_middle"
+ ICON("preferences-desktop-mouse-wheel","icon_mouse_wheel.png",64) // ***
// "enlightenment/mouse_wheel"
+ ICON("preferences-desktop-mouse-extra","icon_mouse_extra.png",64) // ***
// "enlightenment/mouse_extra"
+ ICON("preferences-desktop-locale","icon_intl.png",64)
// "enlightenment/intl"
+ ICON("preferences-desktop-mixer","icon_mixer.png",64)
// "enlightenment/mixer"
+ ICON("preferences-desktop-shelf","icon_shelf.png",64)
// *** // "enlightenment/shelf"
+
ICON("preferences-desktop-shelf-bottom-desk","icon_shelf_bottom_desk.png",64)//
*** // "enlightenment/shelf_bottom_desk"
+ ICON("preferences-desktop-shelf-custom","icon_shelf_custom.png",64)
// *** // "enlightenment/shelf_custom"
+ ICON("preferences-desktop-shelf-dock","icon_shelf_dock.png",64)
// *** // "enlightenment/shelf_dock"
+ ICON("preferences-desktop-shelf-menu-bar","icon_shelf_menu_bar.png",64)
// *** // "enlightenment/shelf_menu_bar"
+ ICON("preferences-desktop-shelf-panel","icon_shelf_panel.png",64)
// *** // "enlightenment/shelf_panel"
+ ICON("preferences-desktop-shelf-top-desk","icon_shelf_top_desk.png",64)
// *** // "enlightenment/shelf_top_desk"
+ ICON("preferences-desktop-window-remember","icon_window_remembers.png",64)
// *** // "enlightenment/window_remembers"
+ ICON("preferences-position-bottom","icon_shelf_bottom.png",64)
// *** // "enlightenment/shelf_position_bottom"
+ ICON("preferences-position-bottom-left","icon_shelf_bottom_left.png",64)
// *** // "enlightenment/shelf_position_bottom_left"
+ ICON("preferences-position-bottom-right","icon_shelf_bottom_right.png",64)
// *** // "enlightenment/shelf_position_bottom_right"
+ ICON("preferences-position-top","icon_shelf_top.png",64)
// *** // "enlightenment/shelf_position_top"
+ ICON("preferences-position-top-left","icon_shelf_top_left.png",64)
// *** // "enlightenment/shelf_position_top_left"
+ ICON("preferences-position-top-right","icon_shelf_top_right.png",64)
// *** // "enlightenment/shelf_position_top_right"
+ ICON("preferences-position-left","icon_shelf_left.png",64)
// *** // "enlightenment/shelf_position_left"
+ ICON("preferences-position-left-top","icon_shelf_left_top.png",64)
// *** // "enlightenment/shelf_position_left_top"
+ ICON("preferences-position-left-bottom","icon_shelf_left_bottom.png",64)
// *** // "enlightenment/shelf_position_left_bottom"
+ ICON("preferences-position-right","icon_shelf_right.png",64)
// *** // "enlightenment/shelf_position_right"
+ ICON("preferences-position-right-top","icon_shelf_right_top.png",64)
// *** // "enlightenment/shelf_position_right_top"
+ ICON("preferences-position-right-bottom","icon_shelf_right_bottom.png",64)
// *** // "enlightenment/shelf_position_right_bottom"
+ ICON("preferences-window-process","icon_window_process_management.png",64)
// *** // "enlightenment/window_process"
+ ICON("preferences-window-manipulation","icon_window_manipulation.png",64)
// *** // "enlightenment/window_manipulation"
+ ICON("preferences-window-maximize","icon_window_manipulation.png",64)
// *** // "enlightenment/window_maximize"
+ ICON("preferences-window-stacking","icon_winlist.png",64)
// *** // "enlightenment/window_stacking"
+ ICON("preferences-window-geometry","icon_window_geometry.png",64)
// *** // "enlightenment/window_geometry"
+ ICON("preferences-windows-lost","icon_lost_windows.png",64)
// *** // "enlightenment/lost_windows"
+ ICON("preferences-gradient","icon_gradient.png",64) // *** //
"enlightenment/gradient"
+ ICON("preferences-focus","icon_window_focus.png",64) // *** //
"enlightenment/focus"
+ ICON("preferences-engine","icon_engine.png",64) // *** //
"enlightenment/engine"
+ ICON("preferences-dialogs","icon_dummy.png",64) // *** //
"enlightenment/dialogs"
+ ICON("preferences-imc","icon_imc.png",64) // *** //
"enlightenment/imc"
+ ICON("preferences-system-lock-screen","icon_desklock.png",64) // *** //
"enlightenment/desklock"
+ ICON("preferences-icon-theme","icon_icon_theme.png",64) // *** //
"enlightenment/icon_theme"
+ ICON("preferences-transitions","icon_transitions.png",64) // *** //
"enlightenment/transitions"
+ ICON("preferences-desktop-edge-bindings","icon_shelf_right.png",64) // ***
// "enlightenment/edges"
+ ICON("preferences-toolbar","icon_toolbar.png",64) // *** //
"enlightenment/toolbar"
+ ICON("preferences-profiles","icon_profiles.png",64) // *** //
"enlightenment/profiles"
+ ICON("preferences-startup","icon_startup.png",64) // *** //
"enlightenment/startup"
+ ICON("preferences-winlist","icon_winlist.png",64) // *** //
"enlightenment/winlist"
+ ICON("preferences-menus","icon_menus.png",64) // *** //
"enlightenment/menus"
+ ICON("preferences-menu-settings","icon_menu_settings.png",64) // *** //
"enlightenment/menu_settings"
+ ICON("preferences-advanced","icon_advanced.png",64) // *** //
"enlightenment/advanced"
+ ICON("preferences-behavior","icon_behavior.png",64) // *** //
"enlightenment/behavior"
+ ICON("preferences-look","icon_look.png",64) // *** //
"enlightenment/look"
+ ICON("preferences-utils","icon_gadget.png",64) // *** //
"enlightenment/utils"
+ ICON("preferences-extensions","icon_extensions.png",64) // *** //
"enlightenment/extensions"
+ ICON("preferences-file-icons","icon_file_icons.png",64) // *** //
"enlightenment/file_icons"
+ ICON("preferences-pager","icon_pager.png",64) // *** //
"enlightenment/pager"
+ ICON("preferences-scale","icon_scale.png",64) // *** //
"enlightenment/scale"
+ ICON("preferences-directories","icon_directories.png",64) // *** //
"enlightenment/directories"
+ ICON("preferences-screen-normal","icon_screen_normal.png",64) // *** //
"enlightenment/screen_normal"
+ ICON("preferences-screen-around","icon_screen_around.png",64) // *** //
"enlightenment/screen_around"
+ ICON("preferences-screen-left","icon_screen_left.png",64) // *** //
"enlightenment/screen_left"
+ ICON("preferences-screen-right","icon_screen_right.png",64) // *** //
"enlightenment/screen_right"
+ ICON("preferences-screen-vflip","icon_screen_vflip.png",64) // *** //
"enlightenment/screen_vflip"
+ ICON("preferences-screen-hflip","icon_screen_hflip.png",64) // *** //
"enlightenment/screen_hflip"
+ ICON("preferences-applications","icon_applications.png",64)
// *** // "enlightenment/applications"
+ ICON("preferences-applications-add","icon_applications_new.png",64)
// *** // "enlightenment/add_application"
+ ICON("preferences-applications-ibar","icon_applications_ibar.png",64)
// *** // "enlightenment/ibar_applications"
+ ICON("preferences-applications-restart","icon_applications_restart.png",64)
// *** // "enlightenment/restart_applications"
+ ICON("preferences-applications-startup","icon_applications_startup.png",64)
// *** // "enlightenment/startup_applications"
+ ICON("preferences-desktop-default-applications","icon_advanced.png",64)
+ ICON("preferences-preferences","icon_config.png",64)
// "enlightenment/configuration" "enlightenment/settings"
+ ICON("preferences-plugin","icon_modules.png",64)
// "enlightenment/modules"
+ ICON("preferences-system","icon_configuration.png",64)
// "enlightenment/configuration" "enlightenment/settings"
+ ICON("preferences-system-windows","icon_windows.png",64)
// "enlightenment/windows" "enlightenment/showhide"
+ ICON("preferences-system-performance","icon_performance.png",64)
// "enlightenment/performance"
+ ICON("preferences-system-power-management","icon_power_management.png",64)
// "enlightenment/power_management"
+
ICON("preferences-system-screen-resolution","icon_screen_resolution.png",64)//
*** // "enlightenment/screen_resolution"
+ ICON("preferences-illume","icon_illume.png",64)
+// ICON("system-file-manager","icon_efm_folder.png",64)
// "enlightenment/fileman"
+ ICON("modules-utils","icon_gadget.png",64)
+ ICON("modules-system","icon_gadget.png",64)
+ ICON("modules-look","icon_look.png",64)
+ ICON("modules-launcher","icon_run.png",64)
+ ICON("modules-core","logo_white_128.png",64)
+ ICON("modules-mobile","icon_globe.png",64)
+ ICON("modules-settings","icon_config.png",64)
+// ICON("emblem-symbolic-link","icon_dummy.png",64) //
EFMBUTTON("symlink")
+ ICON("start-here","logo_white_128.png",128) //
"enlightenment/e"
+// ICON("folder","icon_efm_folder.png",64) //
"fileman/folder"
+// ICON("user-home","icon_efm_home.png",64) //
"fileman/home"
+// ICON("user-temp","icon_efm_tmp.png",64) // *** //
"fileman/tmp"
+// ICON("user-desktop","icon_efm_desktop.png",64) //
"fileman/desktop"
+// ICON("user-bookmarks","icon_favorites.png",64) //
"enlightenment/favorites"
+// ICON("folder-image","icon_wallpaper.png",64) //
"enlightenment/picture"
+ ICON("network-website","icon_globe.png",64) //
"enlightenment/website"
+// ICON("computer","icon_efm_root.png", 64) //
"fileman/root"
+// ICON("drive-harddisk","icon_efm_hdd.png", 128) //
"fileman/hd" "fileman/hdd"
+// ICON("drive-optical","icon_efm_cd.png", 128) //
"fileman/??"
+// ICON("media-flash","icon_efm_flash.png", 128) //
"fileman/??"
+// ICON("drive-removable-media","icon_efm_usbmedia.png", 128);
+ ICON("media-eject","icon_efm_eject.png", 64)
+ ICON("everything-launch","icon_advanced.png",64)
+ ICON("everything-clipboard","icon_evry_clipboard.png", 256)
+
+ ICONMIME("inode/chardevice","icon_efm_file.png",128)
+ ICONMIME("inode/blockdevice","icon_efm_file.png",128)
+ ICONMIME("inode/directory-locked","icon_efm_file.png",128)
+ ICONMIME("inode/directory","icon_efm_folder.png",128)
+ ICONMIME("inode/fifo","icon_efm_file.png",128)
+ ICONMIME("inode/socket","icon_efm_file.png",128)
+
+#define EFM_MIME_ICON(_NAME, _IMAGE, _ASPMIN, _ASPMAX, _STRING, _SIZE,
_VALIGN) \
+ group { name: "e/icons/fileman/mime/"_NAME; \
+ max: _SIZE _SIZE; \
+ images.image: "efm_generic_icon_shadow.png" COMP; \
+ images.image: "efm_generic_icon_base.png" COMP; \
+ images.image: "efm_generic_icon_over.png" COMP; \
+ images.image: _IMAGE COMP; \
+ parts { \
+ part { name: "spacer"; type: SPACER; \
+ description { state: "default" 0.0; \
+ aspect: 1.0 1.0; aspect_preference: BOTH; \
+ } \
+ } \
+ part { name: "shadow"; mouse_events: 0; \
+ description { state: "default" 0.0; \
+ rel1.to: "spacer"; \
+ rel1.relative: (15/240) (10/240); \
+ rel2.to: "spacer"; \
+ rel2.relative: (225/240) (240/240); \
+ image.normal: "efm_generic_icon_shadow.png"; \
+ } \
+ } \
+ part { name: "base"; mouse_events: 0; \
+ description { state: "default" 0.0; \
+ rel1.to: "spacer"; \
+ rel1.relative: (30/240) (15/240); \
+ rel2.to: "spacer"; \
+ rel2.relative: (210/240) (225/240); \
+ image.normal: "efm_generic_icon_base.png"; \
+ } \
+ } \
+ part { name: "content"; mouse_events: 0; \
+ description { state: "default" 0.0; \
+ rel1.to: "base"; \
+ rel1.relative: (28/180) (28/210); \
+ rel2.to: "base"; \
+ rel2.relative: (152/180) (182/210); \
+ align: 0.5 _VALIGN; \
+ aspect: _ASPMIN _ASPMAX; aspect_preference: BOTH; \
+ image.normal: _IMAGE; \
+ } \
+ } \
+ part { name: "over"; mouse_events: 0; \
+ description { state: "default" 0.0; \
+ rel1.to: "base"; \
+ rel2.to: "base"; \
+ image.normal: "efm_generic_icon_over.png"; \
+ } \
+ } \
+ part { name: "typestr"; type: TEXT; mouse_events: 0; \
+ description { state: "default" 0.0; \
+ rel1.to: "over"; \
+ rel1.relative: (72/180) (142/210); \
+ rel2.to: "over"; \
+ rel2.relative: (178/180) (188/210); \
+ color: 255 255 255 255; \
+ text { font: FN; size: 8; \
+ fit: 0 1; \
+ align: 0.5 0.5; \
+ text: _STRING; \
+ } \
+ } \
+ } \
+ } \
+ }
+//Python//
+
+ EFM_MIME_ICON("application/x-python-bytecode",
"efm_generic_icon_content_python.png", (114/115), (114/115), ".PYC", 240, 0.5);
+ EFM_MIME_ICON("application/x-python",
"efm_generic_icon_content_python.png", (114/115), (114/115), ".PY", 240, 0.5);
+ EFM_MIME_ICON("text/x-python", "efm_generic_icon_content_python.png",
(114/115), (114/115), ".PY", 240, 0.5);
+
+ //.pyo .pyd??????????????????//
+
+//Ruby//
+
+ EFM_MIME_ICON("application/x-ruby", "efm_generic_icon_content_ruby.png",
(114/114), (114/114), ".RB", 240, 0.5);
+ EFM_MIME_ICON("text/x-ruby", "efm_generic_icon_content_ruby.png",
(114/114), (114/114), ".RB", 240, 0.5);
+
+ //.rbw???//
+
+//Perl//
+
+ EFM_MIME_ICON("application/x-perl", "efm_generic_icon_content_perl.png",
(114/122), (114/122), ".PERL", 240, 0.5);
+ EFM_MIME_ICON("text/x-perl","efm_generic_icon_content_perl.png", (114/122),
(114/122), ".PL", 240, 0.5);
+
+//CAD//
+
+ EFM_MIME_ICON("application/acad", "efm_generic_icon_content_cad.png",
(114/130), (114/130), ".DWG", 240, 0.5);
+ EFM_MIME_ICON("application/x-acad", "efm_generic_icon_content_cad.png",
(114/130), (114/130), ".DWG", 240, 0.5);
+ EFM_MIME_ICON("application/autocad_dwg",
"efm_generic_icon_content_cad.png", (114/130), (114/130), ".DWG", 240, 0.5);
+ EFM_MIME_ICON("image/x-dwg", "efm_generic_icon_content_cad.png", (114/130),
(114/130), ".DWG", 240, 0.5);
+ EFM_MIME_ICON("application/dwg", "efm_generic_icon_content_cad.png",
(114/130), (114/130), ".DWG", 240, 0.5);
+ EFM_MIME_ICON("application/x-dwg", "efm_generic_icon_content_cad.png",
(114/130), (114/130), ".DWG", 240, 0.5);
+ EFM_MIME_ICON("application/x-autocad", "efm_generic_icon_content_cad.png",
(114/130), (114/130), ".DWG", 240, 0.5);
+ EFM_MIME_ICON("image/vnd.dwg", "efm_generic_icon_content_cad.png",
(114/130), (114/130), ".DWG", 240, 0.5);
+ EFM_MIME_ICON("drawing/dwg", "efm_generic_icon_content_cad.png", (114/130),
(114/130), ".DWG", 240, 0.5);
+
+//ISO//
+
+ EFM_MIME_ICON("application/x-iso9660-image",
"efm_generic_icon_content_iso.png", (114/114), (114/114), ".ISO", 240, 0.5);
+
+//Cue//
+
+ EFM_MIME_ICON("application/x-cue", "efm_generic_icon_content_iso.png",
(114/114), (114/114), ".CUE", 240, 0.5);
+
+//Audio//
+
+ EFM_MIME_ICON("audio/mpeg", "efm_generic_icon_content_audio.png", (54/154),
(54/154), ".MP3", 240, 0.5);
+ EFM_MIME_ICON("audio/x-wav","efm_generic_icon_content_audio.png", (54/154),
(54/154), ".WAV", 240, 0.5);
+ EFM_MIME_ICON("audio/x-flac","efm_generic_icon_content_audio.png",
(54/154), (54/154), ".FLAC", 240, 0.5);
+ EFM_MIME_ICON("audio/flac","efm_generic_icon_content_audio.png", (54/154),
(54/154), ".FLAC", 240, 0.5);
+ EFM_MIME_ICON("audio/x-musepack","efm_generic_icon_content_audio.png",
(54/154), (54/154), ".MPC", 240, 0.5);
+
EFM_MIME_ICON("audio/x-vorbis+ogg","efm_generic_icon_content_audio.png",(54/154),
(54/154), ".OGG", 240, 0.5);
+
EFM_MIME_ICON("application/x-audacity-project","efm_generic_icon_content_audio.png",(54/154),
(54/154), ".AUP", 240, 0.5);
+ EFM_MIME_ICON("audio/x-ms-wma","efm_generic_icon_content_audio.png",
(54/154), (54/154),".WMA", 240, 0.5);
+ EFM_MIME_ICON("audio/opus","efm_generic_icon_content_audio.png", (54/154),
(54/154),".OPUS", 240, 0.5);
+ EFM_MIME_ICON("audio/ogg","efm_generic_icon_content_audio.png", (54/154),
(54/154),".OPUS", 240, 0.5);
+ EFM_MIME_ICON("audio/x-opus+ogg","efm_generic_icon_content_audio.png",
(54/154), (54/154),".OPUS", 240, 0.5);
+ EFM_MIME_ICON("audio/ape","efm_generic_icon_content_audio.png", (54/154),
(54/154), ".APE", 240, 0.5);
+ EFM_MIME_ICON("audio/webm","efm_generic_icon_content_audio.png", (54/154),
(54/154), ".WEBA", 240, 0.5);
+ EFM_MIME_ICON("audio/mp4","efm_generic_icon_content_audio.png", (54/154),
(54/154), ".MP4", 240, 0.5);
+ EFM_MIME_ICON("audio/midi","efm_generic_icon_content_audio.png", (54/154),
(54/154),".MIDI", 240, 0.5);
+ EFM_MIME_ICON("audio/speex","efm_generic_icon_content_audio.png",(54/154),
(54/154), ".SPX", 240, 0.5);
+ EFM_MIME_ICON("audio/aac","efm_generic_icon_content_audio.png", (54/154),
(54/154),".AAC", 240, 0.5);
+
EFM_MIME_ICON("audio/vnd.rn-realaudio","efm_generic_icon_content_audio.png",
(54/154), (54/154),".RA", 240, 0.5);
+ EFM_MIME_ICON("audio/x-voc","efm_generic_icon_content_audio.png", (54/154),
(54/154),".VOC", 240, 0.5);
+ EFM_MIME_ICON("audio/x-tta","efm_generic_icon_content_audio.png", (54/154),
(54/154),".TTA", 240, 0.5);
+ EFM_MIME_ICON("audio/x-stm","efm_generic_icon_content_audio.png", (54/154),
(54/154),".STM", 240, 0.5);
+ EFM_MIME_ICON("audio/x-speex+ogg","efm_generic_icon_content_audio.png",
(54/154), (54/154),".SPX", 240, 0.5);
+ EFM_MIME_ICON("audio/x-wacpack","efm_generic_icon_content_audio.png",
(54/154), (54/154),".WV", 240, 0.5);
+ EFM_MIME_ICON("audio/x-xmf","efm_generic_icon_content_audio.png", (54/154),
(54/154),".XMF", 240, 0.5);
+ EFM_MIME_ICON("audio/x-xm","efm_generic_icon_content_audio.png", (54/154),
(54/154),".XM", 240, 0.5);
+ EFM_MIME_ICON("audio/x-xi","efm_generic_icon_content_audio.png", (54/154),
(54/154),".XI", 240, 0.5);
+
EFM_MIME_ICON("audio/x-wacpack-correction","efm_generic_icon_content_audio.png",
(54/154), (54/154),".WVC", 240, 0.5);
+ EFM_MIME_ICON("audio/x-s3m","efm_generic_icon_content_audio.png", (54/154),
(54/154),".S3M", 240, 0.5);
+ EFM_MIME_ICON("audio/x-riff","efm_generic_icon_content_audio.png",
(54/154), (54/154),".RMI", 240, 0.5);
+ EFM_MIME_ICON("audio/x-psflib","efm_generic_icon_content_audio.png",
(54/154), (54/154),".PSFLIB", 240, 0.5);
+ EFM_MIME_ICON("audio/x-psf","efm_generic_icon_content_audio.png", (54/154),
(54/154),".PSF", 240, 0.5);
+ EFM_MIME_ICON("audio/x-scpls","efm_generic_icon_content_audio.png",
(54/154), (54/154),".PLS", 240, 0.5);
+ EFM_MIME_ICON("audio/x-ms-asx","efm_generic_icon_content_audio.png",
(54/154), (54/154),".ASX", 240, 0.5);
+ EFM_MIME_ICON("audio/x-mpegurl","efm_generic_icon_content_audio.png",
(54/154), (54/154),".M3U", 240, 0.5);
+ EFM_MIME_ICON("audio/x-mod","efm_generic_icon_content_audio.png", (54/154),
(54/154),".MOD", 240, 0.5);
+ EFM_MIME_ICON("audio/x-mo3","efm_generic_icon_content_audio.png", (54/154),
(54/154),".MO3", 240, 0.5);
+ EFM_MIME_ICON("audio/x-minipsf","efm_generic_icon_content_audio.png",
(54/154), (54/154),".MINIPSF", 240, 0.5);
+ EFM_MIME_ICON("audio/matroska","efm_generic_icon_content_audio.png",
(54/154), (54/154),".MKV", 240, 0.5);
+ EFM_MIME_ICON("audio/x-m4b","efm_generic_icon_content_audio.png", (54/154),
(54/154),".M4B", 240, 0.5);
+ EFM_MIME_ICON("audio/x-it","efm_generic_icon_content_audio.png", (54/154),
(54/154),".IT", 240, 0.5);
+ EFM_MIME_ICON("audio/x-iriver-pla","efm_generic_icon_content_audio.png",
(54/154), (54/154),".PLA", 240, 0.5);
+ EFM_MIME_ICON("audio/x-gsm","efm_generic_icon_content_audio.png", (54/154),
(54/154),".GSM", 240, 0.5);
+
EFM_MIME_ICON("audio/x-flac+ogg","efm_generic_icon_content_audio.png",(54/154),
(54/154), ".FLAC", 240, 0.5);
+
EFM_MIME_ICON("audio/x-amzxml","efm_generic_icon_content_audio.png",(54/154),
(54/154), ".AMZ", 240, 0.5);
+ EFM_MIME_ICON("audio/x-aiff","efm_generic_icon_content_audio.png",(54/154),
(54/154), ".AIFF", 240, 0.5);
+ EFM_MIME_ICON("audio/x-aifc","efm_generic_icon_content_audio.png",(54/154),
(54/154), ".AIFC", 240, 0.5);
+
EFM_MIME_ICON("audio/x-adpcm","efm_generic_icon_content_audio.png",(54/154),
(54/154), ".ADPCM", 240, 0.5);
+
EFM_MIME_ICON("audio/vdn.rn-realaudio","efm_generic_icon_content_audio.png",(54/154),
(54/154), ".RA", 240, 0.5);
+
EFM_MIME_ICON("audio/vdn.dts","efm_generic_icon_content_audio.png",(54/154),
(54/154), ".DTS", 240, 0.5);
+
EFM_MIME_ICON("audio/vdn.dts.hd","efm_generic_icon_content_audio.png",(54/154),
(54/154), ".DTSHD", 240, 0.5);
+
EFM_MIME_ICON("audio/prs.sid","efm_generic_icon_content_audio.png",(54/154),
(54/154), ".SID", 240, 0.5);
+ EFM_MIME_ICON("audio/mp2","efm_generic_icon_content_audio.png", (54/154),
(54/154), ".MP2", 240, 0.5);
+ EFM_MIME_ICON("audio/basic","efm_generic_icon_content_audio.png", (54/154),
(54/154), ".SND", 240, 0.5);
+ EFM_MIME_ICON("audio/annodex","efm_generic_icon_content_audio.png",
(54/154), (54/154), ".AXA", 240, 0.5);
+ EFM_MIME_ICON("audio/AMR","efm_generic_icon_content_audio.png", (54/154),
(54/154), ".AMR", 240, 0.5);
+ EFM_MIME_ICON("audio/amr","efm_generic_icon_content_audio.png", (54/154),
(54/154), ".AMR", 240, 0.5);
+ EFM_MIME_ICON("audio/amr-wb","efm_generic_icon_content_audio.png",
(54/154), (54/154), ".AWB", 240, 0.5);
+ EFM_MIME_ICON("audio/AMR-WB","efm_generic_icon_content_audio.png",
(54/154), (54/154), ".AWB", 240, 0.5);
+ EFM_MIME_ICON("audio/ac3","efm_generic_icon_content_audio.png", (54/154),
(54/154), ".AC3", 240, 0.5);
+
+ EFM_MIME_ICON("application/x-mpegurl","efm_generic_icon_content_audio.png",
(54/154), (54/154),".M3U", 240, 0.5);
+
EFM_MIME_ICON("application/vnd.apple.mpegurl","efm_generic_icon_content_audio.png",
(54/154), (54/154),".M3U", 240, 0.5);
+
+//Code//
+
+ EFM_MIME_ICON("text/x-csrc","efm_generic_icon_content_code.png", (114/88),
(114/88), ".C", 240, 0.3);
+ EFM_MIME_ICON("text/x-chdr","efm_generic_icon_content_code.png", (114/88),
(114/88), ".H", 240, 0.3);
+ EFM_MIME_ICON("text/x-c++hdr","efm_generic_icon_content_code.png",
(114/88), (114/88), ".HH", 240, 0.3);
+ EFM_MIME_ICON("text/x-c++src","efm_generic_icon_content_code.png",
(114/88), (114/88), ".C++", 240, 0.3);
+ EFM_MIME_ICON("text/x-csharp","efm_generic_icon_content_code.png",
(114/88), (114/88), ".C#", 240, 0.3);
+ EFM_MIME_ICON("application/x-awk","efm_generic_icon_content_code.png",
(114/88), (114/88), ".AWK", 240, 0.3);
+ EFM_MIME_ICON("text/x-hdr","efm_generic_icon_content_code.png", (114/88),
(114/88), ".HPP", 240, 0.3);
+ EFM_MIME_ICON("text/x-fortran","efm_generic_icon_content_code.png",
(114/88), (114/88), ".F", 240, 0.3);
+ EFM_MIME_ICON("text/x-java-source","efm_generic_icon_content_code.png",
(114/88), (114/88), ".JAVA", 240, 0.3);
+
+
+ //add moreeeeeee//
+
+//Text//
+
+ EFM_MIME_ICON("text/x-patch","efm_generic_icon_content_text.png",
(114/126), (114/126), ".PATCH", 240, 0.5);
+ EFM_MIME_ICON("text/plain","efm_generic_icon_content_text.png", (114/126),
(114/126), ".TXT", 240, 0.5);
+ EFM_MIME_ICON("text/x-log","efm_generic_icon_content_text.png", (114/126),
(114/126), ".LOG", 240, 0.5);
+ EFM_MIME_ICON("application/x-md5","efm_generic_icon_content_text.png",
(114/126), (114/126), ".MD5", 240, 0.5);
+ EFM_MIME_ICON("text/x-makefile","efm_generic_icon_content_text.png",
(114/126), (114/126), ".MK", 240, 0.5);
+ EFM_MIME_ICON("application/x-m4","efm_generic_icon_content_text.png",
(114/126), (114/126), ".M4", 240, 0.5);
+
EFM_MIME_ICON("application/pkix-attr-cert","efm_generic_icon_content_text.png",
(114/126), (114/126), ".AC", 240, 0.5);
+ EFM_MIME_ICON("text/x-subviewer","efm_generic_icon_content_text.png",
(114/126), (114/126), ".SUB", 240, 0.5);
+
EFM_MIME_ICON("application/x-wais-source","efm_generic_icon_content_text.png",
(114/126), (114/126), ".SRC", 240, 0.5);
+
+//Web//
+
+ EFM_MIME_ICON("text/css","efm_generic_icon_content_web.png", (114/68),
(114/68), ".CSS", 240, 0.3);
+ EFM_MIME_ICON("text/html","efm_generic_icon_content_web.png", (114/68),
(114/68), ".HTML", 240, 0.3);
+ EFM_MIME_ICON("application/xml","efm_generic_icon_content_web.png",
(114/68), (114/68), ".XML", 240, 0.3);
+ EFM_MIME_ICON("application/javascript","efm_generic_icon_content_web.png",
(114/68), (114/68), ".JS", 240, 0.3);
+ EFM_MIME_ICON("application/json","efm_generic_icon_content_web.png",
(114/68), (114/68), ".JSON", 240, 0.3);
+ EFM_MIME_ICON("text/json","efm_generic_icon_content_web.png", (114/68),
(114/68), ".JSON", 240, 0.3);
+
+//Enlightenment//
+
+ EFM_MIME_ICON("application/edje","efm_generic_icon_content_logo.png",
(114/154), (114/154), ".EDJ", 240, 0.5);
+ EFM_MIME_ICON("text/edje","efm_generic_icon_content_logo.png", (114/154),
(114/154), ".EDC", 240, 0.5);
+
+//Document//
+
+
EFM_MIME_ICON("application/vnd.oasis.opendocument.text","efm_generic_icon_content_doc.png",
(114/154), (114/154), ".ODT", 240, 0.5);
+ EFM_MIME_ICON("application/x-msword","efm_generic_icon_content_doc.png",
(114/154), (114/154), ".DOC", 240, 0.5);
+
EFM_MIME_ICON("application/vnd.openxmlformats-officedocument.wordprocessingml.document","efm_generic_icon_content_doc.png",
(114/154), (114/154), ".DOCX", 240, 0.5);
+ EFM_MIME_ICON("application/x-abiword","efm_generic_icon_content_doc.png",
(114/154), (114/154), ".ABW", 240, 0.5);
+ EFM_MIME_ICON("application/vnd.scribus","efm_generic_icon_content_doc.png",
(114/154), (114/154), ".SLA", 240, 0.5);
+ EFM_MIME_ICON("application/x-lyx","efm_generic_icon_content_doc.png",
(114/154), (114/154), ".LYX", 240, 0.5);
+
+//Spreadsheet//
+
+
EFM_MIME_ICON("application/vnd.oasis.opendocument.spreadsheet","efm_generic_icon_content_spread.png",
(114/80), (114/80), ".ODS", 240, 0.5);
+
EFM_MIME_ICON("application/vnd.ms-excel","efm_generic_icon_content_spread.png",
(114/80), (114/80), ".XLS", 240, 0.5);
+
+//Presentation//
+
+
EFM_MIME_ICON("application/vnd.ms-powerpoint","efm_generic_icon_content_pres.png",
(114/95), (114/95), ".PPT", 240, 0.5);
+
EFM_MIME_ICON("application/vnd.oasis.opendocument.presentation","efm_generic_icon_content_pres.png",
(114/95), (114/95), ".ODP", 240, 0.5);
+
+//Drawing//
+
+
EFM_MIME_ICON("application/x-vnd.oasis.opendocument.graphics","efm_generic_icon_content_draw.png",
(114/96), (114/96), ".ODG", 240, 0.5);
+
+//Data Base//
+
+
EFM_MIME_ICON("application/vnd.ms-binder","efm_generic_icon_content_db.png",
(114/128), (114/128), ".ODB", 240, 0.5);
+ EFM_MIME_ICON("application/x-sqlite3","efm_generic_icon_content_db.png",
(114/128), (114/128), ".SQLITE", 240, 0.5);
+
+//Formula//
+
+
EFM_MIME_ICON("application/x-vnd.oasis.opendocument.formula","efm_generic_icon_content_formula.png",
(114/85), (114/85), ".ODF", 240, 0.5);
+
+//Template//
+
+
EFM_MIME_ICON("application/vnd.openxmlformats-officedocument.wordprocessingml.template","efm_generic_icon_content_template.png",
(114/130), (114/130), ".DOTX", 240, 0.5);
+
EFM_MIME_ICON("application/vnd.openxmlformats-officedocument.spreadsheetml.template","efm_generic_icon_content_template.png",
(114/130), (114/130),".XLTX", 240, 0.5);
+
EFM_MIME_ICON("application/vnd.openxmlformats-officedocument.presentationml.template","efm_generic_icon_content_template.png",
(114/130), (114/130),".POTX", 240, 0.5);
+
EFM_MIME_ICON("application/vnd.oasis.opendocument.chart-template","efm_generic_icon_content_template.png",
(114/130), (114/130),".OTC", 240, 0.5);
+
EFM_MIME_ICON("application/vnd.oasis.opendocument.formula-template","efm_generic_icon_content_template.png",
(114/130), (114/130), ".OTF", 240, 0.5);
+
EFM_MIME_ICON("application/vnd.oasis.opendocument.graphics-template","efm_generic_icon_content_template.png",
(114/130), (114/130), ".OTG", 240, 0.5);
+
EFM_MIME_ICON("application/vnd.oasis.opendocument.image-template","efm_generic_icon_content_template.png",
(114/130), (114/130), ".OTI", 240, 0.5);
+
EFM_MIME_ICON("application/vnd.oasis.opendocument.presentation-template","efm_generic_icon_content_template.png",
(114/130), (114/130), ".OTP", 240, 0.5);
+
EFM_MIME_ICON("application/vnd.oasis.opendocument.spreadsheet-template","efm_generic_icon_content_template.png",
(114/130), (114/130), ".ODS", 240, 0.5);
+
EFM_MIME_ICON("application/vnd.oasis.opendocument.text-template","efm_generic_icon_content_template.png",
(114/130), (114/130), ".OTT", 240, 0.5);
+
+//Video (fallback)//
+
+ EFM_MIME_ICON("video/mpeg","efm_generic_icon_content_video.png", (114/83),
(114/83), ".MPEG", 240, 0.5);
+
EFM_MIME_ICON("application/ogg","efm_generic_icon_content_video.png",(114/83),
(114/83), ".OGG", 240, 0.5);
+
EFM_MIME_ICON("video/x-theora+ogg","efm_generic_icon_content_video.png",(114/83),
(114/83), ".OGG", 240, 0.5);
+ EFM_MIME_ICON("video/x-msvideo","efm_generic_icon_content_video.png",
(114/83), (114/83), ".AVI", 240, 0.5);
+ EFM_MIME_ICON("video/ogg","efm_generic_icon_content_video.png",(114/83),
(114/83), ".OGG", 240, 0.5);
+ EFM_MIME_ICON("video/mp4","efm_generic_icon_content_video.png",(114/83),
(114/83), ".MP4", 240, 0.5);
+
EFM_MIME_ICON("video/quicktime","efm_generic_icon_content_video.png",(114/83),
(114/83), ".MOV", 240, 0.5);
+
EFM_MIME_ICON("video/x-matroska","efm_generic_icon_content_video.png",(114/83),
(114/83), ".MKV", 240, 0.5);
+ EFM_MIME_ICON("video/x-flv","efm_generic_icon_content_video.png", (114/83),
(114/83), ".FLV", 240, 0.5);
+
EFM_MIME_ICON("application/vnd.rn-realmedia","efm_generic_icon_content_video.png",(114/83),
(114/83), ".REAL", 240, 0.5);
+
EFM_MIME_ICON("video/x-ms-wmv","efm_generic_icon_content_video.png",(114/83),
(114/83), ".WMV", 240, 0.5);
+ EFM_MIME_ICON("video/webm","efm_generic_icon_content_video.png",(114/83),
(114/83), ".WEBM", 240, 0.5);
+
+
+//Image (fallback)//
+
+ EFM_MIME_ICON("image/png","efm_generic_icon_content_image.png", (114/128),
(114/128), ".PNG", 240, 0.5);
+ EFM_MIME_ICON("image/jpeg","efm_generic_icon_content_image.png", (114/128),
(114/128),".JPEG", 240, 0.5);
+ EFM_MIME_ICON("image/gif","efm_generic_icon_content_image.png", (114/128),
(114/128),".GIF", 240, 0.5);
+ EFM_MIME_ICON("image/bmp","efm_generic_icon_content_image.png", (114/128),
(114/128),".BMP", 240, 0.5);
+ EFM_MIME_ICON("application/x-xcf","efm_generic_icon_content_image.png",
(114/128), (114/128),".XCF", 240, 0.5);
+ EFM_MIME_ICON("application/x-cbz","efm_generic_icon_content_image.png",
(114/128), (114/128),".CBZ", 240, 0.5);
+
EFM_MIME_ICON("application/x-cbr","efm_generic_icon_content_image.png",(114/128),
(114/128), ".CBR", 240, 0.5);
+ EFM_MIME_ICON("image/webp","efm_generic_icon_content_image.png", (114/128),
(114/128),".WEBP", 240, 0.5);
+
+//Font//
+
+ EFM_MIME_ICON("application/x-font-ttf","efm_generic_icon_content_font.png",
(114/93), (114/93), ".TTF", 240, 0.5);
+ EFM_MIME_ICON("application/x-font-pcf","efm_generic_icon_content_font.png",
(114/93), (114/93), ".PCF", 240, 0.5);
+ EFM_MIME_ICON("application/x-font-bdf","efm_generic_icon_content_font.png",
(114/93), (114/93), ".BDF", 240, 0.5);
+ EFM_MIME_ICON("application/x-font-otf","efm_generic_icon_content_font.png",
(114/93), (114/93), ".BDF", 240, 0.5);
+
+//PS (fallback)//
+
+ EFM_MIME_ICON("application/postscript","efm_generic_icon_content_ps.png",
(114/104), (114/104), ".PS", 240, 0.5);
+
+//PDF (fallback)//
+
+ EFM_MIME_ICON("application/pdf","efm_generic_icon_content_pdf.png",
(114/101), (114/101), ".PDF", 240, 0.5);
+
+//Translate//
+
+
EFM_MIME_ICON("text/x-gettext-translation","efm_generic_icon_content_translate.png",
(114/97), (114/97), ".PO", 240, 0.5);
+
EFM_MIME_ICON("application/x-gettext-translation","efm_generic_icon_content_translate.png",
(114/97), (114/97), ".GMO", 240, 0.5);
+
+//Base 2//
+#define EFM_MIME_ICON_SIMPLE(_NAME, _IMAGE, _ASPMIN, _ASPMAX, _SIZE, _VALIGN) \
+ group { name: "e/icons/fileman/mime/"_NAME; \
+ max: _SIZE _SIZE; \
+ images.image: "efm_generic_icon_shadow_empty.png" COMP; \
+ images.image: "efm_generic_icon_base_empty.png" COMP; \
+ images.image: "efm_generic_icon_over_empty.png" COMP; \
+ images.image: _IMAGE COMP; \
+ parts { \
+ part { name: "spacer"; type: SPACER; \
+ description { state: "default" 0.0; \
+ aspect: 1.0 1.0; aspect_preference: BOTH; \
+ } \
+ } \
+ part { name: "shadow"; mouse_events: 0; \
+ description { state: "default" 0.0; \
+ rel1.to: "spacer"; \
+ rel1.relative: (15/240) (10/240); \
+ rel2.to: "spacer"; \
+ rel2.relative: (225/240) (240/240); \
+ image.normal: "efm_generic_icon_shadow_empty.png"; \
+ } \
+ } \
+ part { name: "base"; mouse_events: 0; \
+ description { state: "default" 0.0; \
+ rel1.to: "spacer"; \
+ rel1.relative: (30/240) (15/240); \
+ rel2.to: "spacer"; \
+ rel2.relative: (210/240) (225/240); \
+ image.normal: "efm_generic_icon_base_empty.png"; \
+ } \
+ } \
+ part { name: "content"; mouse_events: 0; \
+ description { state: "default" 0.0; \
+ rel1.to: "base"; \
+ rel1.relative: (28/180) (28/210); \
+ rel2.to: "base"; \
+ rel2.relative: (152/180) (182/210); \
+ align: 0.5 _VALIGN; \
+ aspect: _ASPMIN _ASPMAX; aspect_preference: BOTH; \
+ image.normal: _IMAGE; \
+ } \
+ } \
+ part { name: "over"; mouse_events: 0; \
+ description { state: "default" 0.0; \
+ rel1.to: "base"; \
+ rel2.to: "base"; \
+ image.normal: "efm_generic_icon_over_empty.png"; \
+ } \
+ } \
+ } \
+ }
+
+//Script//
+
+
EFM_MIME_ICON_SIMPLE("application/x-shellscript","efm_generic_icon_content_script.png",
(114/126), (114/126), 240, 0.5);
+
+//Executable//
+
+
EFM_MIME_ICON_SIMPLE("application/x-executable","efm_generic_icon_content_executable.png",
(114/114), (114/114), 240, 0.5);
+
EFM_MIME_ICON_SIMPLE("application/x-ms-dos-executable","efm_generic_icon_content_executable.png",
(114/114), (114/114), 240, 0.5);
+
+//Libraries//
+
+
EFM_MIME_ICON_SIMPLE("application/x-sharedlib","efm_generic_icon_content_lib.png",
(114/114), (114/114), 240, 0.5);
+
EFM_MIME_ICON_SIMPLE("application/x-shared-library-la","efm_generic_icon_content_lib.png",
(114/114), (114/114), 240, 0.5);
+
+//Unknown//
+
+
EFM_MIME_ICON_SIMPLE("application/x-object","efm_generic_icon_content_unknown.png",
(100/154), (100/154), 240, 0.5);
+
+//Trash//
+
+
EFM_MIME_ICON_SIMPLE("application/x-trash","efm_generic_icon_content_trash.png",
(114/142), (114/142), 240, 0.5);
+
+//Octet-Stream//
+
+
EFM_MIME_ICON_SIMPLE("application/octet-stream","efm_generic_icon_content_text.png",(114/126),
(114/126), 240, 0.5);
+
+//Install//
+
+
EFM_MIME_ICON_SIMPLE("application/x-install-instructions","efm_generic_icon_content_install.png",(114/149),
(114/149), 240, 0.5);
+
+//Cache//
+
+ EFM_MIME_ICON_SIMPLE("chemical/x-cache","efm_generic_icon_content_db.png",
(114/128), (114/128), 240, 0.5);
+
+//Inode//
+
+
EFM_MIME_ICON_SIMPLE("inode/chardevice","efm_generic_icon_content_inode_char.png",
(114/77), (114/77), 240, 0.5);
+
EFM_MIME_ICON_SIMPLE("inode/blockdevice","efm_generic_icon_content_inode_block.png",
(81/114), (81/114), 240, 0.5);
+
EFM_MIME_ICON_SIMPLE("inode/fifo","efm_generic_icon_content_inode_fifo.png",
(87/114), (87/114), 240, 0.5);
+
EFM_MIME_ICON_SIMPLE("inode/socket","efm_generic_icon_content_inode_socket.png",
(114/114), (114/114), 240, 0.5);
+
EFM_MIME_ICON_SIMPLE("inode/file","efm_generic_icon_content_inode_file.png",
(83/114), (83/114), 240, 0.5);
+
+#undefine EFM_MIME_ICON
+#undefine EFM_MIME_ICON_SIMPLE
+
+ /* #define EFMICON(NAME, FILE, SIZE) \
+ * group { name: "e/icons/fileman/"NAME; \
+ * max: SIZE SIZE; \
+ * parts { \
+ * part { name: "icon"; \
+ * mouse_events: 0; \
+ * description { state: "default" 0.0; \
+ * aspect: 1.0 1.0; \
+ * aspect_preference: BOTH; \
+ * image.image: FILE COMP; \
+ * image.normal: FILE ; \
+ * } \
+ * } \
+ * } \
+ * } */
+ //EFMICON("folder","icon_efm_folder.png", 128)
+ //EFMICON("chrdev","icon_efm_file.png", 128)
+ //EFMICON("blkdev","icon_efm_file.png", 128)
+ //EFMICON("fifo","icon_efm_file.png", 128)
+ //EFMICON("socket","icon_efm_file.png", 128)
+ //EFMICON("executable","icon_efm_file.png", 128)
+ //EFMICON("home","icon_efm_home.png", 128)
+ //EFMICON("root","icon_efm_root.png", 128)
+ //EFMICON("tmp","icon_efm_tmp.png", 128)
+ //EFMICON("desktop","icon_efm_desktop.png", 128)
+ //EFMICON("hdd","icon_efm_hdd.png", 128)
+ //EFMICON("hd","icon_efm_hdd.png", 128)
+
+ // EFM Mime type icons //
+
+ #define MIMEICON(NAME, FILE, SIZE) \
+ group { \
+ name: "e/icons/fileman/mime/"NAME; \
+ max: SIZE SIZE; \
+ parts { \
+ part { \
+ name: "icon"; \
+ mouse_events: 0; \
+ description { \
+ state: "default" 0.0; \
+ aspect: 1.0 1.0; \
+ aspect_preference: BOTH; \
+ image.image: "O/"FILE COMP; \
+ image.normal: "O/"FILE ; \
+ } \
+ } \
+ } \
+ }
+
+// MIMEICON("inode/directory","icon_efm_folder.png", 128);
+
+ MIMEICON("application/x-deb","icon_mime_deb.png", 128);
+ MIMEICON("application/x-bzip","icon_mime_package.png", 128);
+ MIMEICON("application/zip","icon_mime_package.png", 128);
+ MIMEICON("application/x-gzip","icon_mime_package.png", 128);
+ MIMEICON("application/x-bzip-compressed-tar","icon_mime_package.png", 128);
+ MIMEICON("application/x-bzip2-compressed-tar","icon_mime_package.png",128);
+ MIMEICON("application/x-compressed-tar","icon_mime_package.png",128);
+ MIMEICON("application/x-tar","icon_mime_package.png", 128);
+ MIMEICON("application/x-rar","icon_mime_package.png", 128);
+
+ MIMEICON("application/x-7z-compressed","icon_mime_package.png", 128);
+ MIMEICON("application/vnd.ms-cab-compressed","icon_mime_package.png", 128);
+#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 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://creativecommons.org/ns#";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ inkscape:export-ydpi="384"
+ inkscape:export-xdpi="384"
+ inkscape:export-filename="/home/raster/C/th-efl/th/img/ic/close-060.png"
+ inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+ sodipodi:docname="close.svg"
+ viewBox="0 0 15 15"
+ height="15"
+ width="15"
+ id="svg2"
+ version="1.1">
+ <metadata
+ id="metadata8">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs6" />
+ <sodipodi:namedview
+ inkscape:current-layer="g10"
+ inkscape:window-maximized="0"
+ inkscape:window-y="0"
+ inkscape:window-x="804"
+ inkscape:cy="7.5"
+ inkscape:cx="7.5"
+ inkscape:zoom="68.333333"
+ showgrid="true"
+ id="namedview4"
+ inkscape:window-height="1372"
+ inkscape:window-width="1756"
+ inkscape:pageshadow="2"
+ inkscape:pageopacity="0"
+ guidetolerance="10"
+ gridtolerance="10"
+ objecttolerance="10"
+ borderopacity="1"
+ bordercolor="#666666"
+ pagecolor="#404040">
+ <inkscape:grid
+ spacingy="0.5"
+ spacingx="0.5"
+ id="grid837"
+ type="xygrid" />
+ </sodipodi:namedview>
+ <g
+ id="g10"
+ inkscape:label="Image"
+ inkscape:groupmode="layer">
+ <path
+ id="path839"
+ 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"
+
style="fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
/>
+ </g>
+</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
Binary files /dev/null and b/data/elementary/themes/img/ic/arrow-d-015.png
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
Binary files /dev/null and b/data/elementary/themes/img/ic/arrow-d-030.png
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
Binary files /dev/null and b/data/elementary/themes/img/ic/arrow-d-060.png
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
Binary files /dev/null and b/data/elementary/themes/img/ic/arrow-l-015.png
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
Binary files /dev/null and b/data/elementary/themes/img/ic/arrow-l-030.png
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
Binary files /dev/null and b/data/elementary/themes/img/ic/arrow-l-060.png
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
Binary files /dev/null and b/data/elementary/themes/img/ic/arrow-r-015.png
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
Binary files /dev/null and b/data/elementary/themes/img/ic/arrow-r-030.png
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
Binary files /dev/null and b/data/elementary/themes/img/ic/arrow-r-060.png
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
Binary files /dev/null and b/data/elementary/themes/img/ic/arrow-u-015.png
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
Binary files /dev/null and b/data/elementary/themes/img/ic/arrow-u-030.png
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
Binary files /dev/null and b/data/elementary/themes/img/ic/arrow-u-060.png
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
Binary files /dev/null and b/data/elementary/themes/img/ic/close-015.png 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
Binary files /dev/null and b/data/elementary/themes/img/ic/close-030.png 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
Binary files /dev/null and b/data/elementary/themes/img/ic/close-060.png 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
Binary files /dev/null and b/data/elementary/themes/img/ic/efm-computer-040.png
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
Binary files /dev/null and b/data/elementary/themes/img/ic/efm-computer-080.png
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
Binary files /dev/null and b/data/elementary/themes/img/ic/efm-computer-160.png
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
Binary files /dev/null and b/data/elementary/themes/img/ic/efm-desktop-040.png
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
Binary files /dev/null and b/data/elementary/themes/img/ic/efm-desktop-080.png
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
Binary files /dev/null and b/data/elementary/themes/img/ic/efm-desktop-160.png
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
Binary files /dev/null and b/data/elementary/themes/img/ic/efm-drive-cd-040.png
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
Binary files /dev/null and b/data/elementary/themes/img/ic/efm-drive-cd-080.png
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
Binary files /dev/null and b/data/elementary/themes/img/ic/efm-drive-cd-160.png
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
Binary files /dev/null and
b/data/elementary/themes/img/ic/efm-drive-flash-040.png 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
Binary files /dev/null and
b/data/elementary/themes/img/ic/efm-drive-flash-080.png 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
Binary files /dev/null and
b/data/elementary/themes/img/ic/efm-drive-flash-160.png 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
Binary files /dev/null and
b/data/elementary/themes/img/ic/efm-drive-hdd-040.png 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
Binary files /dev/null and
b/data/elementary/themes/img/ic/efm-drive-hdd-080.png 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
Binary files /dev/null and
b/data/elementary/themes/img/ic/efm-drive-hdd-160.png 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
Binary files /dev/null and
b/data/elementary/themes/img/ic/efm-drive-usb-media-040.png 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
Binary files /dev/null and
b/data/elementary/themes/img/ic/efm-drive-usb-media-080.png 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
Binary files /dev/null and
b/data/elementary/themes/img/ic/efm-drive-usb-media-160.png 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
Binary files /dev/null and b/data/elementary/themes/img/ic/efm-favorite-040.png
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
Binary files /dev/null and b/data/elementary/themes/img/ic/efm-favorite-080.png
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
Binary files /dev/null and b/data/elementary/themes/img/ic/efm-favorite-160.png
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
Binary files /dev/null and b/data/elementary/themes/img/ic/efm-folder-040.png
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
Binary files /dev/null and b/data/elementary/themes/img/ic/efm-folder-080.png
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
Binary files /dev/null and b/data/elementary/themes/img/ic/efm-folder-160.png
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
Binary files /dev/null and b/data/elementary/themes/img/ic/efm-home-040.png
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
Binary files /dev/null and b/data/elementary/themes/img/ic/efm-home-080.png
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
Binary files /dev/null and b/data/elementary/themes/img/ic/efm-home-160.png
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
Binary files /dev/null and b/data/elementary/themes/img/ic/efm-temp-040.png
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
Binary files /dev/null and b/data/elementary/themes/img/ic/efm-temp-080.png
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
Binary files /dev/null and b/data/elementary/themes/img/ic/efm-temp-160.png
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
Binary files /dev/null and b/data/elementary/themes/img/ic/heart-015.png 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
Binary files /dev/null and b/data/elementary/themes/img/ic/heart-030.png 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
Binary files /dev/null and b/data/elementary/themes/img/ic/heart-060.png 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
Binary files /dev/null and b/data/elementary/themes/img/ic/reload-015.png 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
Binary files /dev/null and b/data/elementary/themes/img/ic/reload-030.png 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
Binary files /dev/null and b/data/elementary/themes/img/ic/reload-060.png 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
Binary files /dev/null and
b/data/elementary/themes/img/ic/system-shutdown-040.png 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
Binary files /dev/null and
b/data/elementary/themes/img/ic/system-shutdown-080.png 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
Binary files /dev/null and
b/data/elementary/themes/img/ic/system-shutdown-160.png 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
Binary files /dev/null and
b/data/elementary/themes/img/ic/system-suspend-040.png 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
Binary files /dev/null and
b/data/elementary/themes/img/ic/system-suspend-080.png 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
Binary files /dev/null and
b/data/elementary/themes/img/ic/system-suspend-160.png 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
Binary files /dev/null and b/data/elementary/themes/img/ic/unknown-040.png
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
Binary files /dev/null and b/data/elementary/themes/img/ic/unknown-080.png
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
Binary files /dev/null and b/data/elementary/themes/img/ic/unknown-160.png
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 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://creativecommons.org/ns#";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ inkscape:export-ydpi="48"
+ inkscape:export-xdpi="48"
+
inkscape:export-filename="/home/raster/C/th-efl/th/img/ic/system-shutdown-040.png"
+ inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+ sodipodi:docname="system-shutdown.svg"
+ viewBox="0 0 80 80"
+ height="80"
+ width="80"
+ id="svg2"
+ version="1.1">
+ <metadata
+ id="metadata8">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs6" />
+ <sodipodi:namedview
+ inkscape:current-layer="g10"
+ inkscape:window-maximized="0"
+ inkscape:window-y="0"
+ inkscape:window-x="0"
+ inkscape:cy="40.047847"
+ inkscape:cx="40"
+ inkscape:zoom="10.45"
+ showgrid="true"
+ id="namedview4"
+ inkscape:window-height="1017"
+ inkscape:window-width="1920"
+ inkscape:pageshadow="2"
+ inkscape:pageopacity="0"
+ guidetolerance="10"
+ gridtolerance="10"
+ objecttolerance="10"
+ borderopacity="1"
+ bordercolor="#666666"
+ pagecolor="#404040">
+ <inkscape:grid
+ id="grid837"
+ type="xygrid" />
+ </sodipodi:namedview>
+ <g
+ id="g10"
+ inkscape:label="Image"
+ inkscape:groupmode="layer">
+ <path
+ id="path839"
+ d="M 40,16 V 40"
+
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"
/>
+ <path
+ 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"
+ sodipodi:arc-type="arc"
+ sodipodi:open="true"
+ sodipodi:end="4.1887902"
+ sodipodi:start="5.2359878"
+ sodipodi:ry="26.044935"
+ sodipodi:rx="26.044935"
+ sodipodi:cy="39.805237"
+ sodipodi:cx="40.002903"
+ sodipodi:type="arc"
+ id="path841"
+
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"
/>
+ </g>
+</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 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://creativecommons.org/ns#";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ inkscape:export-ydpi="48"
+ inkscape:export-xdpi="48"
+
inkscape:export-filename="/home/raster/C/th-efl/th/img/ic/system-suspend-040.png"
+ inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+ sodipodi:docname="system-suspend.svg"
+ viewBox="0 0 80 80"
+ height="80"
+ width="80"
+ id="svg2"
+ version="1.1">
+ <metadata
+ id="metadata8">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs6" />
+ <sodipodi:namedview
+ inkscape:current-layer="g10"
+ inkscape:window-maximized="0"
+ inkscape:window-y="0"
+ inkscape:window-x="0"
+ inkscape:cy="40.047847"
+ inkscape:cx="40"
+ inkscape:zoom="10.45"
+ showgrid="true"
+ id="namedview4"
+ inkscape:window-height="1017"
+ inkscape:window-width="1920"
+ inkscape:pageshadow="2"
+ inkscape:pageopacity="0"
+ guidetolerance="10"
+ gridtolerance="10"
+ objecttolerance="10"
+ borderopacity="1"
+ bordercolor="#666666"
+ pagecolor="#404040">
+ <inkscape:grid
+ id="grid837"
+ type="xygrid" />
+ </sodipodi:namedview>
+ <g
+ id="g10"
+ inkscape:label="Image"
+ inkscape:groupmode="layer">
+ <ellipse
+ ry="25.841658"
+ rx="25.89924"
+ cy="40.088707"
+ cx="40.031124"
+ id="path943"
+
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"
/>
+ <path
+ id="path945"
+ d="m 32,28 c 0,24 0,24 0,24 v 0"
+
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"
/>
+ <path
+
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"
+ d="m 48,28 c 0,24 0,24 0,24 v 0"
+ id="path947" />
+ </g>
+</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 @@
offscale
#define WIN_SHADOW_SPACER \
rel1.offset: 21 14; \
- rel2.offset: -21 -28; \
+ rel2.offset: -22 -29; \
offscale
#define WIN_MENU_SHADOW \
image.normal: "win_menu_shadow.png"; \
--
