summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorHermet Park <chuneon.park@samsung.com>2021-02-18 13:23:04 +0900
committerHermet Park <chuneon.park@samsung.com>2021-02-18 13:23:04 +0900
commitdfd0a112bfe90cf21bcd4649b0144dcc151ff54e (patch)
treef5c81304db1bad8b5ace809e97f89d058dc49898 /data
parent23cce0129cad582fa892dba3e431f745a8009011 (diff)
parentd25a58e1480579f76e794eccd3753d329bb7e0c1 (diff)
Merge branch 'feature/themes/flat' into devs/hermet/lottie
Diffstat (limited to 'data')
-rw-r--r--data/elementary/themes/edc/O/efm_icons.edc427
-rw-r--r--data/elementary/themes/edc/clock.edc1
-rw-r--r--data/elementary/themes/edc/efl/bg.edc10
-rw-r--r--data/elementary/themes/edc/efl/border.edc772
-rw-r--r--data/elementary/themes/edc/elm/bg.edc1
-rw-r--r--data/elementary/themes/edc/elm/border.edc4
-rw-r--r--data/elementary/themes/edc/elm/calendar.edc230
-rw-r--r--data/elementary/themes/edc/elm/check.edc23
-rw-r--r--data/elementary/themes/edc/elm/code.edc19
-rw-r--r--data/elementary/themes/edc/elm/entry.edc8
-rw-r--r--data/elementary/themes/edc/ibar-ibox.edc96
-rw-r--r--data/elementary/themes/edc/icons.edc217
-rw-r--r--data/elementary/themes/edc/illume.edc676
-rw-r--r--data/elementary/themes/edc/pager.edc144
-rw-r--r--data/elementary/themes/edc/pager16.edc123
-rw-r--r--data/elementary/themes/edc/shelf.edc128
-rw-r--r--data/elementary/themes/edc/systray.edc44
-rw-r--r--data/elementary/themes/edc/tasks.edc94
-rw-r--r--data/elementary/themes/ic.edc27
-rw-r--r--data/elementary/themes/img/efm-cad.svg232
-rw-r--r--data/elementary/themes/img/efm-code.svg356
-rw-r--r--data/elementary/themes/img/efm-db.svg181
-rw-r--r--data/elementary/themes/img/efm-deb.svg376
-rw-r--r--data/elementary/themes/img/efm-doc.svg281
-rw-r--r--data/elementary/themes/img/efm-draw.svg180
-rw-r--r--data/elementary/themes/img/efm-efile.svg302
-rw-r--r--data/elementary/themes/img/efm-formula.svg192
-rw-r--r--data/elementary/themes/img/efm-html.svg150
-rw-r--r--data/elementary/themes/img/efm-install.svg215
-rw-r--r--data/elementary/themes/img/efm-lua.svg149
-rw-r--r--data/elementary/themes/img/efm-o.svg555
-rw-r--r--data/elementary/themes/img/efm-pdf.svg136
-rw-r--r--data/elementary/themes/img/efm-php.svg144
-rw-r--r--data/elementary/themes/img/efm-pl.svg136
-rw-r--r--data/elementary/themes/img/efm-present.svg277
-rw-r--r--data/elementary/themes/img/efm-ps.svg255
-rw-r--r--data/elementary/themes/img/efm-py.svg145
-rw-r--r--data/elementary/themes/img/efm-pyb.svg142
-rw-r--r--data/elementary/themes/img/efm-rb.svg174
-rw-r--r--data/elementary/themes/img/efm-so.svg174
-rw-r--r--data/elementary/themes/img/efm-spreadsheet.svg248
-rw-r--r--data/elementary/themes/img/efm-template.svg215
-rw-r--r--data/elementary/themes/img/film.svg171
-rw-r--r--data/elementary/themes/img/font-file.svg563
-rw-r--r--data/elementary/themes/img/ic/efm-cad-040.pngbin0 -> 861 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-cad-080.pngbin0 -> 1654 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-cad-160.pngbin0 -> 3303 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-code-040.pngbin0 -> 815 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-code-080.pngbin0 -> 1354 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-code-160.pngbin0 -> 2896 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-db-040.pngbin0 -> 1069 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-db-080.pngbin0 -> 1661 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-db-160.pngbin0 -> 2424 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-deb-040.pngbin0 -> 2047 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-deb-080.pngbin0 -> 5072 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-deb-160.pngbin0 -> 11869 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-doc-040.pngbin0 -> 580 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-doc-080.pngbin0 -> 950 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-doc-160.pngbin0 -> 1683 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-draw-040.pngbin0 -> 767 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-draw-080.pngbin0 -> 1357 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-draw-160.pngbin0 -> 2515 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-efile-040.pngbin0 -> 1372 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-efile-080.pngbin0 -> 6930 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-efile-160.pngbin0 -> 6930 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-formula-040.pngbin0 -> 989 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-formula-080.pngbin0 -> 2089 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-formula-160.pngbin0 -> 4459 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-html-040.pngbin0 -> 1458 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-html-080.pngbin0 -> 3508 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-html-160.pngbin0 -> 8004 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-install-040.pngbin0 -> 544 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-install-080.pngbin0 -> 905 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-install-160.pngbin0 -> 1572 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-lua-040.pngbin0 -> 1046 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-lua-080.pngbin0 -> 2211 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-lua-160.pngbin0 -> 4518 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-o-040.pngbin0 -> 728 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-o-080.pngbin0 -> 1377 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-o-160.pngbin0 -> 2906 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-pdf-040.pngbin0 -> 1083 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-pdf-080.pngbin0 -> 2112 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-pdf-160.pngbin0 -> 4177 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-php-040.pngbin0 -> 969 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-php-080.pngbin0 -> 1946 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-php-160.pngbin0 -> 3898 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-pl-040.pngbin0 -> 1283 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-pl-080.pngbin0 -> 2797 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-pl-160.pngbin0 -> 5691 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-present-040.pngbin0 -> 900 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-present-080.pngbin0 -> 1586 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-present-160.pngbin0 -> 2839 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-ps-040.pngbin0 -> 1159 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-ps-080.pngbin0 -> 2275 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-ps-160.pngbin0 -> 4882 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-py-040.pngbin0 -> 1146 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-py-080.pngbin0 -> 2302 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-py-160.pngbin0 -> 4515 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-pyb-040.pngbin0 -> 772 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-pyb-080.pngbin0 -> 1520 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-pyb-160.pngbin0 -> 2938 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-rb-040.pngbin0 -> 1340 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-rb-080.pngbin0 -> 2784 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-rb-160.pngbin0 -> 5368 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-so-040.pngbin0 -> 1174 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-so-080.pngbin0 -> 2388 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-so-160.pngbin0 -> 5523 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-spreadsheet-040.pngbin0 -> 567 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-spreadsheet-080.pngbin0 -> 981 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-spreadsheet-160.pngbin0 -> 1911 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-template-040.pngbin0 -> 560 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-template-080.pngbin0 -> 920 bytes
-rw-r--r--data/elementary/themes/img/ic/efm-template-160.pngbin0 -> 1599 bytes
-rw-r--r--data/elementary/themes/img/ic/film-040.pngbin0 -> 840 bytes
-rw-r--r--data/elementary/themes/img/ic/film-080.pngbin0 -> 1456 bytes
-rw-r--r--data/elementary/themes/img/ic/film-160.pngbin0 -> 2846 bytes
-rw-r--r--data/elementary/themes/img/ic/font-file-040.pngbin0 -> 1006 bytes
-rw-r--r--data/elementary/themes/img/ic/font-file-080.pngbin0 -> 1791 bytes
-rw-r--r--data/elementary/themes/img/ic/font-file-160.pngbin0 -> 3770 bytes
-rw-r--r--data/elementary/themes/img/ic/sound-040.pngbin0 -> 2427 bytes
-rw-r--r--data/elementary/themes/img/ic/sound-080.pngbin0 -> 6371 bytes
-rw-r--r--data/elementary/themes/img/ic/sound-160.pngbin0 -> 13861 bytes
-rw-r--r--data/elementary/themes/img/sound.svg149
-rw-r--r--data/elementary/themes/macros.edc1
-rw-r--r--data/elementary/themes/snd/kbd-tap.wavbin15668 -> 4264 bytes
-rw-r--r--data/elementary/themes/snd/kbd-tap2.wavbin20848 -> 9288 bytes
-rw-r--r--data/elementary/themes/snd/kbd-tap3.wavbin22024 -> 2412 bytes
-rw-r--r--data/elementary/themes/snd/kbd-tap4.wavbin26784 -> 3460 bytes
-rw-r--r--data/elementary/themes/snd/kbd-tap5.wavbin22528 -> 2768 bytes
-rw-r--r--data/elementary/themes/snd/wood-tap.wavbin0 -> 22320 bytes
-rw-r--r--data/elementary/themes/snd/wood-tap2.wavbin0 -> 17964 bytes
131 files changed, 7074 insertions, 2069 deletions
diff --git a/data/elementary/themes/edc/O/efm_icons.edc b/data/elementary/themes/edc/O/efm_icons.edc
index f5212f97ba..8cb7cb9891 100644
--- a/data/elementary/themes/edc/O/efm_icons.edc
+++ b/data/elementary/themes/edc/O/efm_icons.edc
@@ -1,427 +1,2 @@
1// EFM icons // 1
2
3//Base 1//
4
5#define EFM_MIME_ICON(_NAME, _IMAGE, _ASPMIN, _ASPMAX, _STRING, _SIZE, _VALIGN) \
6 group { name: "e/icons/fileman/mime/"_NAME; \
7 max: _SIZE _SIZE; \
8 images.image: "efm_generic_icon_shadow.png" COMP; \
9 images.image: "efm_generic_icon_base.png" COMP; \
10 images.image: "efm_generic_icon_over.png" COMP; \
11 images.image: _IMAGE COMP; \
12 parts { \
13 part { name: "spacer"; type: SPACER; \
14 description { state: "default" 0.0; \
15 aspect: 1.0 1.0; aspect_preference: BOTH; \
16 } \
17 } \
18 part { name: "shadow"; mouse_events: 0; \
19 description { state: "default" 0.0; \
20 rel1.to: "spacer"; \
21 rel1.relative: (15/240) (10/240); \
22 rel2.to: "spacer"; \
23 rel2.relative: (225/240) (240/240); \
24 image.normal: "efm_generic_icon_shadow.png"; \
25 } \
26 } \
27 part { name: "base"; mouse_events: 0; \
28 description { state: "default" 0.0; \
29 rel1.to: "spacer"; \
30 rel1.relative: (30/240) (15/240); \
31 rel2.to: "spacer"; \
32 rel2.relative: (210/240) (225/240); \
33 image.normal: "efm_generic_icon_base.png"; \
34 } \
35 } \
36 part { name: "content"; mouse_events: 0; \
37 description { state: "default" 0.0; \
38 rel1.to: "base"; \
39 rel1.relative: (28/180) (28/210); \
40 rel2.to: "base"; \
41 rel2.relative: (152/180) (182/210); \
42 align: 0.5 _VALIGN; \
43 aspect: _ASPMIN _ASPMAX; aspect_preference: BOTH; \
44 image.normal: _IMAGE; \
45 } \
46 } \
47 part { name: "over"; mouse_events: 0; \
48 description { state: "default" 0.0; \
49 rel1.to: "base"; \
50 rel2.to: "base"; \
51 image.normal: "efm_generic_icon_over.png"; \
52 } \
53 } \
54 part { name: "typestr"; type: TEXT; mouse_events: 0; \
55 description { state: "default" 0.0; \
56 rel1.to: "over"; \
57 rel1.relative: (72/180) (142/210); \
58 rel2.to: "over"; \
59 rel2.relative: (178/180) (188/210); \
60 color: 255 255 255 255; \
61 text { font: FN; size: 8; \
62 fit: 0 1; \
63 align: 0.5 0.5; \
64 text: _STRING; \
65 } \
66 } \
67 } \
68 } \
69 }
70//Python//
71
72 EFM_MIME_ICON("application/x-python-bytecode", "efm_generic_icon_content_python.png", (114/115), (114/115), ".PYC", 240, 0.5);
73 EFM_MIME_ICON("application/x-python", "efm_generic_icon_content_python.png", (114/115), (114/115), ".PY", 240, 0.5);
74 EFM_MIME_ICON("text/x-python", "efm_generic_icon_content_python.png", (114/115), (114/115), ".PY", 240, 0.5);
75
76 //.pyo .pyd??????????????????//
77
78//Ruby//
79
80 EFM_MIME_ICON("application/x-ruby", "efm_generic_icon_content_ruby.png", (114/114), (114/114), ".RB", 240, 0.5);
81 EFM_MIME_ICON("text/x-ruby", "efm_generic_icon_content_ruby.png", (114/114), (114/114), ".RB", 240, 0.5);
82
83 //.rbw???//
84
85//Perl//
86
87 EFM_MIME_ICON("application/x-perl", "efm_generic_icon_content_perl.png", (114/122), (114/122), ".PERL", 240, 0.5);
88 EFM_MIME_ICON("text/x-perl","efm_generic_icon_content_perl.png", (114/122), (114/122), ".PL", 240, 0.5);
89
90//CAD//
91
92 EFM_MIME_ICON("application/acad", "efm_generic_icon_content_cad.png", (114/130), (114/130), ".DWG", 240, 0.5);
93 EFM_MIME_ICON("application/x-acad", "efm_generic_icon_content_cad.png", (114/130), (114/130), ".DWG", 240, 0.5);
94 EFM_MIME_ICON("application/autocad_dwg", "efm_generic_icon_content_cad.png", (114/130), (114/130), ".DWG", 240, 0.5);
95 EFM_MIME_ICON("image/x-dwg", "efm_generic_icon_content_cad.png", (114/130), (114/130), ".DWG", 240, 0.5);
96 EFM_MIME_ICON("application/dwg", "efm_generic_icon_content_cad.png", (114/130), (114/130), ".DWG", 240, 0.5);
97 EFM_MIME_ICON("application/x-dwg", "efm_generic_icon_content_cad.png", (114/130), (114/130), ".DWG", 240, 0.5);
98 EFM_MIME_ICON("application/x-autocad", "efm_generic_icon_content_cad.png", (114/130), (114/130), ".DWG", 240, 0.5);
99 EFM_MIME_ICON("image/vnd.dwg", "efm_generic_icon_content_cad.png", (114/130), (114/130), ".DWG", 240, 0.5);
100 EFM_MIME_ICON("drawing/dwg", "efm_generic_icon_content_cad.png", (114/130), (114/130), ".DWG", 240, 0.5);
101
102//ISO//
103
104 EFM_MIME_ICON("application/x-iso9660-image", "efm_generic_icon_content_iso.png", (114/114), (114/114), ".ISO", 240, 0.5);
105
106//Cue//
107
108 EFM_MIME_ICON("application/x-cue", "efm_generic_icon_content_iso.png", (114/114), (114/114), ".CUE", 240, 0.5);
109
110//Audio//
111
112 EFM_MIME_ICON("audio/mpeg", "efm_generic_icon_content_audio.png", (54/154), (54/154), ".MP3", 240, 0.5);
113 EFM_MIME_ICON("audio/x-wav","efm_generic_icon_content_audio.png", (54/154), (54/154), ".WAV", 240, 0.5);
114 EFM_MIME_ICON("audio/x-flac","efm_generic_icon_content_audio.png", (54/154), (54/154), ".FLAC", 240, 0.5);
115 EFM_MIME_ICON("audio/flac","efm_generic_icon_content_audio.png", (54/154), (54/154), ".FLAC", 240, 0.5);
116 EFM_MIME_ICON("audio/x-musepack","efm_generic_icon_content_audio.png", (54/154), (54/154), ".MPC", 240, 0.5);
117 EFM_MIME_ICON("audio/x-vorbis+ogg","efm_generic_icon_content_audio.png",(54/154), (54/154), ".OGG", 240, 0.5);
118 EFM_MIME_ICON("application/x-audacity-project","efm_generic_icon_content_audio.png",(54/154), (54/154), ".AUP", 240, 0.5);
119 EFM_MIME_ICON("audio/x-ms-wma","efm_generic_icon_content_audio.png", (54/154), (54/154),".WMA", 240, 0.5);
120 EFM_MIME_ICON("audio/opus","efm_generic_icon_content_audio.png", (54/154), (54/154),".OPUS", 240, 0.5);
121 EFM_MIME_ICON("audio/ogg","efm_generic_icon_content_audio.png", (54/154), (54/154),".OPUS", 240, 0.5);
122 EFM_MIME_ICON("audio/x-opus+ogg","efm_generic_icon_content_audio.png", (54/154), (54/154),".OPUS", 240, 0.5);
123 EFM_MIME_ICON("audio/ape","efm_generic_icon_content_audio.png", (54/154), (54/154), ".APE", 240, 0.5);
124 EFM_MIME_ICON("audio/webm","efm_generic_icon_content_audio.png", (54/154), (54/154), ".WEBA", 240, 0.5);
125 EFM_MIME_ICON("audio/mp4","efm_generic_icon_content_audio.png", (54/154), (54/154), ".MP4", 240, 0.5);
126 EFM_MIME_ICON("audio/midi","efm_generic_icon_content_audio.png", (54/154), (54/154),".MIDI", 240, 0.5);
127 EFM_MIME_ICON("audio/speex","efm_generic_icon_content_audio.png",(54/154), (54/154), ".SPX", 240, 0.5);
128 EFM_MIME_ICON("audio/aac","efm_generic_icon_content_audio.png", (54/154), (54/154),".AAC", 240, 0.5);
129 EFM_MIME_ICON("audio/vnd.rn-realaudio","efm_generic_icon_content_audio.png", (54/154), (54/154),".RA", 240, 0.5);
130 EFM_MIME_ICON("audio/x-voc","efm_generic_icon_content_audio.png", (54/154), (54/154),".VOC", 240, 0.5);
131 EFM_MIME_ICON("audio/x-tta","efm_generic_icon_content_audio.png", (54/154), (54/154),".TTA", 240, 0.5);
132 EFM_MIME_ICON("audio/x-stm","efm_generic_icon_content_audio.png", (54/154), (54/154),".STM", 240, 0.5);
133 EFM_MIME_ICON("audio/x-speex+ogg","efm_generic_icon_content_audio.png", (54/154), (54/154),".SPX", 240, 0.5);
134 EFM_MIME_ICON("audio/x-wacpack","efm_generic_icon_content_audio.png", (54/154), (54/154),".WV", 240, 0.5);
135 EFM_MIME_ICON("audio/x-xmf","efm_generic_icon_content_audio.png", (54/154), (54/154),".XMF", 240, 0.5);
136 EFM_MIME_ICON("audio/x-xm","efm_generic_icon_content_audio.png", (54/154), (54/154),".XM", 240, 0.5);
137 EFM_MIME_ICON("audio/x-xi","efm_generic_icon_content_audio.png", (54/154), (54/154),".XI", 240, 0.5);
138 EFM_MIME_ICON("audio/x-wacpack-correction","efm_generic_icon_content_audio.png", (54/154), (54/154),".WVC", 240, 0.5);
139 EFM_MIME_ICON("audio/x-s3m","efm_generic_icon_content_audio.png", (54/154), (54/154),".S3M", 240, 0.5);
140 EFM_MIME_ICON("audio/x-riff","efm_generic_icon_content_audio.png", (54/154), (54/154),".RMI", 240, 0.5);
141 EFM_MIME_ICON("audio/x-psflib","efm_generic_icon_content_audio.png", (54/154), (54/154),".PSFLIB", 240, 0.5);
142 EFM_MIME_ICON("audio/x-psf","efm_generic_icon_content_audio.png", (54/154), (54/154),".PSF", 240, 0.5);
143 EFM_MIME_ICON("audio/x-scpls","efm_generic_icon_content_audio.png", (54/154), (54/154),".PLS", 240, 0.5);
144 EFM_MIME_ICON("audio/x-ms-asx","efm_generic_icon_content_audio.png", (54/154), (54/154),".ASX", 240, 0.5);
145 EFM_MIME_ICON("audio/x-mpegurl","efm_generic_icon_content_audio.png", (54/154), (54/154),".M3U", 240, 0.5);
146 EFM_MIME_ICON("audio/x-mod","efm_generic_icon_content_audio.png", (54/154), (54/154),".MOD", 240, 0.5);
147 EFM_MIME_ICON("audio/x-mo3","efm_generic_icon_content_audio.png", (54/154), (54/154),".MO3", 240, 0.5);
148 EFM_MIME_ICON("audio/x-minipsf","efm_generic_icon_content_audio.png", (54/154), (54/154),".MINIPSF", 240, 0.5);
149 EFM_MIME_ICON("audio/matroska","efm_generic_icon_content_audio.png", (54/154), (54/154),".MKV", 240, 0.5);
150 EFM_MIME_ICON("audio/x-m4b","efm_generic_icon_content_audio.png", (54/154), (54/154),".M4B", 240, 0.5);
151 EFM_MIME_ICON("audio/x-it","efm_generic_icon_content_audio.png", (54/154), (54/154),".IT", 240, 0.5);
152 EFM_MIME_ICON("audio/x-iriver-pla","efm_generic_icon_content_audio.png", (54/154), (54/154),".PLA", 240, 0.5);
153 EFM_MIME_ICON("audio/x-gsm","efm_generic_icon_content_audio.png", (54/154), (54/154),".GSM", 240, 0.5);
154 EFM_MIME_ICON("audio/x-flac+ogg","efm_generic_icon_content_audio.png",(54/154), (54/154), ".FLAC", 240, 0.5);
155 EFM_MIME_ICON("audio/x-amzxml","efm_generic_icon_content_audio.png",(54/154), (54/154), ".AMZ", 240, 0.5);
156 EFM_MIME_ICON("audio/x-aiff","efm_generic_icon_content_audio.png",(54/154), (54/154), ".AIFF", 240, 0.5);
157 EFM_MIME_ICON("audio/x-aifc","efm_generic_icon_content_audio.png",(54/154), (54/154), ".AIFC", 240, 0.5);
158 EFM_MIME_ICON("audio/x-adpcm","efm_generic_icon_content_audio.png",(54/154), (54/154), ".ADPCM", 240, 0.5);
159 EFM_MIME_ICON("audio/vdn.rn-realaudio","efm_generic_icon_content_audio.png",(54/154), (54/154), ".RA", 240, 0.5);
160 EFM_MIME_ICON("audio/vdn.dts","efm_generic_icon_content_audio.png",(54/154), (54/154), ".DTS", 240, 0.5);
161 EFM_MIME_ICON("audio/vdn.dts.hd","efm_generic_icon_content_audio.png",(54/154), (54/154), ".DTSHD", 240, 0.5);
162 EFM_MIME_ICON("audio/prs.sid","efm_generic_icon_content_audio.png",(54/154), (54/154), ".SID", 240, 0.5);
163 EFM_MIME_ICON("audio/mp2","efm_generic_icon_content_audio.png", (54/154), (54/154), ".MP2", 240, 0.5);
164 EFM_MIME_ICON("audio/basic","efm_generic_icon_content_audio.png", (54/154), (54/154), ".SND", 240, 0.5);
165 EFM_MIME_ICON("audio/annodex","efm_generic_icon_content_audio.png", (54/154), (54/154), ".AXA", 240, 0.5);
166 EFM_MIME_ICON("audio/AMR","efm_generic_icon_content_audio.png", (54/154), (54/154), ".AMR", 240, 0.5);
167 EFM_MIME_ICON("audio/amr","efm_generic_icon_content_audio.png", (54/154), (54/154), ".AMR", 240, 0.5);
168 EFM_MIME_ICON("audio/amr-wb","efm_generic_icon_content_audio.png", (54/154), (54/154), ".AWB", 240, 0.5);
169 EFM_MIME_ICON("audio/AMR-WB","efm_generic_icon_content_audio.png", (54/154), (54/154), ".AWB", 240, 0.5);
170 EFM_MIME_ICON("audio/ac3","efm_generic_icon_content_audio.png", (54/154), (54/154), ".AC3", 240, 0.5);
171
172 EFM_MIME_ICON("application/x-mpegurl","efm_generic_icon_content_audio.png", (54/154), (54/154),".M3U", 240, 0.5);
173 EFM_MIME_ICON("application/vnd.apple.mpegurl","efm_generic_icon_content_audio.png", (54/154), (54/154),".M3U", 240, 0.5);
174
175//Code//
176
177 EFM_MIME_ICON("text/x-csharp","efm_generic_icon_content_code.png", (114/88), (114/88), ".C#", 240, 0.3);
178 EFM_MIME_ICON("application/x-awk","efm_generic_icon_content_code.png", (114/88), (114/88), ".AWK", 240, 0.3);
179 EFM_MIME_ICON("text/x-hdr","efm_generic_icon_content_code.png", (114/88), (114/88), ".HPP", 240, 0.3);
180 EFM_MIME_ICON("text/x-fortran","efm_generic_icon_content_code.png", (114/88), (114/88), ".F", 240, 0.3);
181 EFM_MIME_ICON("text/x-java-source","efm_generic_icon_content_code.png", (114/88), (114/88), ".JAVA", 240, 0.3);
182
183
184 //add moreeeeeee//
185
186//Text//
187
188 EFM_MIME_ICON("text/x-patch","efm_generic_icon_content_text.png", (114/126), (114/126), ".PATCH", 240, 0.5);
189 EFM_MIME_ICON("text/x-log","efm_generic_icon_content_text.png", (114/126), (114/126), ".LOG", 240, 0.5);
190 EFM_MIME_ICON("application/x-md5","efm_generic_icon_content_text.png", (114/126), (114/126), ".MD5", 240, 0.5);
191 EFM_MIME_ICON("text/x-makefile","efm_generic_icon_content_text.png", (114/126), (114/126), ".MK", 240, 0.5);
192 EFM_MIME_ICON("application/x-m4","efm_generic_icon_content_text.png", (114/126), (114/126), ".M4", 240, 0.5);
193 EFM_MIME_ICON("application/pkix-attr-cert","efm_generic_icon_content_text.png", (114/126), (114/126), ".AC", 240, 0.5);
194 EFM_MIME_ICON("text/x-subviewer","efm_generic_icon_content_text.png", (114/126), (114/126), ".SUB", 240, 0.5);
195 EFM_MIME_ICON("application/x-wais-source","efm_generic_icon_content_text.png", (114/126), (114/126), ".SRC", 240, 0.5);
196
197//Web//
198
199 EFM_MIME_ICON("text/css","efm_generic_icon_content_web.png", (114/68), (114/68), ".CSS", 240, 0.3);
200 EFM_MIME_ICON("text/html","efm_generic_icon_content_web.png", (114/68), (114/68), ".HTML", 240, 0.3);
201 EFM_MIME_ICON("application/xml","efm_generic_icon_content_web.png", (114/68), (114/68), ".XML", 240, 0.3);
202 EFM_MIME_ICON("application/javascript","efm_generic_icon_content_web.png", (114/68), (114/68), ".JS", 240, 0.3);
203 EFM_MIME_ICON("application/json","efm_generic_icon_content_web.png", (114/68), (114/68), ".JSON", 240, 0.3);
204 EFM_MIME_ICON("text/json","efm_generic_icon_content_web.png", (114/68), (114/68), ".JSON", 240, 0.3);
205
206//Enlightenment//
207
208 EFM_MIME_ICON("application/edje","efm_generic_icon_content_logo.png", (114/154), (114/154), ".EDJ", 240, 0.5);
209 EFM_MIME_ICON("text/edje","efm_generic_icon_content_logo.png", (114/154), (114/154), ".EDC", 240, 0.5);
210
211//Document//
212
213 EFM_MIME_ICON("application/vnd.oasis.opendocument.text","efm_generic_icon_content_doc.png", (114/154), (114/154), ".ODT", 240, 0.5);
214 EFM_MIME_ICON("application/x-msword","efm_generic_icon_content_doc.png", (114/154), (114/154), ".DOC", 240, 0.5);
215 EFM_MIME_ICON("application/vnd.openxmlformats-officedocument.wordprocessingml.document","efm_generic_icon_content_doc.png", (114/154), (114/154), ".DOCX", 240, 0.5);
216 EFM_MIME_ICON("application/x-abiword","efm_generic_icon_content_doc.png", (114/154), (114/154), ".ABW", 240, 0.5);
217 EFM_MIME_ICON("application/vnd.scribus","efm_generic_icon_content_doc.png", (114/154), (114/154), ".SLA", 240, 0.5);
218 EFM_MIME_ICON("application/x-lyx","efm_generic_icon_content_doc.png", (114/154), (114/154), ".LYX", 240, 0.5);
219
220//Spreadsheet//
221
222 EFM_MIME_ICON("application/vnd.oasis.opendocument.spreadsheet","efm_generic_icon_content_spread.png", (114/80), (114/80), ".ODS", 240, 0.5);
223 EFM_MIME_ICON("application/vnd.ms-excel","efm_generic_icon_content_spread.png", (114/80), (114/80), ".XLS", 240, 0.5);
224
225//Presentation//
226
227 EFM_MIME_ICON("application/vnd.ms-powerpoint","efm_generic_icon_content_pres.png", (114/95), (114/95), ".PPT", 240, 0.5);
228 EFM_MIME_ICON("application/vnd.oasis.opendocument.presentation","efm_generic_icon_content_pres.png", (114/95), (114/95), ".ODP", 240, 0.5);
229
230//Drawing//
231
232 EFM_MIME_ICON("application/x-vnd.oasis.opendocument.graphics","efm_generic_icon_content_draw.png", (114/96), (114/96), ".ODG", 240, 0.5);
233
234//Data Base//
235
236 EFM_MIME_ICON("application/vnd.ms-binder","efm_generic_icon_content_db.png", (114/128), (114/128), ".ODB", 240, 0.5);
237 EFM_MIME_ICON("application/x-sqlite3","efm_generic_icon_content_db.png", (114/128), (114/128), ".SQLITE", 240, 0.5);
238
239//Formula//
240
241 EFM_MIME_ICON("application/x-vnd.oasis.opendocument.formula","efm_generic_icon_content_formula.png", (114/85), (114/85), ".ODF", 240, 0.5);
242
243//Template//
244
245 EFM_MIME_ICON("application/vnd.openxmlformats-officedocument.wordprocessingml.template","efm_generic_icon_content_template.png", (114/130), (114/130), ".DOTX", 240, 0.5);
246 EFM_MIME_ICON("application/vnd.openxmlformats-officedocument.spreadsheetml.template","efm_generic_icon_content_template.png", (114/130), (114/130),".XLTX", 240, 0.5);
247 EFM_MIME_ICON("application/vnd.openxmlformats-officedocument.presentationml.template","efm_generic_icon_content_template.png", (114/130), (114/130),".POTX", 240, 0.5);
248 EFM_MIME_ICON("application/vnd.oasis.opendocument.chart-template","efm_generic_icon_content_template.png", (114/130), (114/130),".OTC", 240, 0.5);
249 EFM_MIME_ICON("application/vnd.oasis.opendocument.formula-template","efm_generic_icon_content_template.png", (114/130), (114/130), ".OTF", 240, 0.5);
250 EFM_MIME_ICON("application/vnd.oasis.opendocument.graphics-template","efm_generic_icon_content_template.png", (114/130), (114/130), ".OTG", 240, 0.5);
251 EFM_MIME_ICON("application/vnd.oasis.opendocument.image-template","efm_generic_icon_content_template.png", (114/130), (114/130), ".OTI", 240, 0.5);
252 EFM_MIME_ICON("application/vnd.oasis.opendocument.presentation-template","efm_generic_icon_content_template.png", (114/130), (114/130), ".OTP", 240, 0.5);
253 EFM_MIME_ICON("application/vnd.oasis.opendocument.spreadsheet-template","efm_generic_icon_content_template.png", (114/130), (114/130), ".ODS", 240, 0.5);
254 EFM_MIME_ICON("application/vnd.oasis.opendocument.text-template","efm_generic_icon_content_template.png", (114/130), (114/130), ".OTT", 240, 0.5);
255
256//Video (fallback)//
257
258 EFM_MIME_ICON("video/mpeg","efm_generic_icon_content_video.png", (114/83), (114/83), ".MPEG", 240, 0.5);
259 EFM_MIME_ICON("application/ogg","efm_generic_icon_content_video.png",(114/83), (114/83), ".OGG", 240, 0.5);
260 EFM_MIME_ICON("video/x-theora+ogg","efm_generic_icon_content_video.png",(114/83), (114/83), ".OGG", 240, 0.5);
261 EFM_MIME_ICON("video/x-msvideo","efm_generic_icon_content_video.png", (114/83), (114/83), ".AVI", 240, 0.5);
262 EFM_MIME_ICON("video/ogg","efm_generic_icon_content_video.png",(114/83), (114/83), ".OGG", 240, 0.5);
263 EFM_MIME_ICON("video/mp4","efm_generic_icon_content_video.png",(114/83), (114/83), ".MP4", 240, 0.5);
264 EFM_MIME_ICON("video/quicktime","efm_generic_icon_content_video.png",(114/83), (114/83), ".MOV", 240, 0.5);
265 EFM_MIME_ICON("video/x-matroska","efm_generic_icon_content_video.png",(114/83), (114/83), ".MKV", 240, 0.5);
266 EFM_MIME_ICON("video/x-flv","efm_generic_icon_content_video.png", (114/83), (114/83), ".FLV", 240, 0.5);
267 EFM_MIME_ICON("application/vnd.rn-realmedia","efm_generic_icon_content_video.png",(114/83), (114/83), ".REAL", 240, 0.5);
268 EFM_MIME_ICON("video/x-ms-wmv","efm_generic_icon_content_video.png",(114/83), (114/83), ".WMV", 240, 0.5);
269 EFM_MIME_ICON("video/webm","efm_generic_icon_content_video.png",(114/83), (114/83), ".WEBM", 240, 0.5);
270
271
272//Image (fallback)//
273
274 EFM_MIME_ICON("image/png","efm_generic_icon_content_image.png", (114/128), (114/128), ".PNG", 240, 0.5);
275 EFM_MIME_ICON("image/jpeg","efm_generic_icon_content_image.png", (114/128), (114/128),".JPEG", 240, 0.5);
276 EFM_MIME_ICON("image/gif","efm_generic_icon_content_image.png", (114/128), (114/128),".GIF", 240, 0.5);
277 EFM_MIME_ICON("image/bmp","efm_generic_icon_content_image.png", (114/128), (114/128),".BMP", 240, 0.5);
278 EFM_MIME_ICON("application/x-xcf","efm_generic_icon_content_image.png", (114/128), (114/128),".XCF", 240, 0.5);
279 EFM_MIME_ICON("application/x-cbz","efm_generic_icon_content_image.png", (114/128), (114/128),".CBZ", 240, 0.5);
280 EFM_MIME_ICON("application/x-cbr","efm_generic_icon_content_image.png",(114/128), (114/128), ".CBR", 240, 0.5);
281 EFM_MIME_ICON("image/webp","efm_generic_icon_content_image.png", (114/128), (114/128),".WEBP", 240, 0.5);
282
283//Font//
284
285 EFM_MIME_ICON("application/x-font-ttf","efm_generic_icon_content_font.png", (114/93), (114/93), ".TTF", 240, 0.5);
286 EFM_MIME_ICON("application/x-font-pcf","efm_generic_icon_content_font.png", (114/93), (114/93), ".PCF", 240, 0.5);
287 EFM_MIME_ICON("application/x-font-bdf","efm_generic_icon_content_font.png", (114/93), (114/93), ".BDF", 240, 0.5);
288 EFM_MIME_ICON("application/x-font-otf","efm_generic_icon_content_font.png", (114/93), (114/93), ".BDF", 240, 0.5);
289
290//PS (fallback)//
291
292 EFM_MIME_ICON("application/postscript","efm_generic_icon_content_ps.png", (114/104), (114/104), ".PS", 240, 0.5);
293
294//PDF (fallback)//
295
296 EFM_MIME_ICON("application/pdf","efm_generic_icon_content_pdf.png", (114/101), (114/101), ".PDF", 240, 0.5);
297
298//Translate//
299
300 EFM_MIME_ICON("text/x-gettext-translation","efm_generic_icon_content_translate.png", (114/97), (114/97), ".PO", 240, 0.5);
301 EFM_MIME_ICON("application/x-gettext-translation","efm_generic_icon_content_translate.png", (114/97), (114/97), ".GMO", 240, 0.5);
302
303//Base 2//
304#define EFM_MIME_ICON_SIMPLE(_NAME, _IMAGE, _ASPMIN, _ASPMAX, _SIZE, _VALIGN) \
305 group { name: "e/icons/fileman/mime/"_NAME; \
306 max: _SIZE _SIZE; \
307 images.image: "efm_generic_icon_shadow_empty.png" COMP; \
308 images.image: "efm_generic_icon_base_empty.png" COMP; \
309 images.image: "efm_generic_icon_over_empty.png" COMP; \
310 images.image: _IMAGE COMP; \
311 parts { \
312 part { name: "spacer"; type: SPACER; \
313 description { state: "default" 0.0; \
314 aspect: 1.0 1.0; aspect_preference: BOTH; \
315 } \
316 } \
317 part { name: "shadow"; mouse_events: 0; \
318 description { state: "default" 0.0; \
319 rel1.to: "spacer"; \
320 rel1.relative: (15/240) (10/240); \
321 rel2.to: "spacer"; \
322 rel2.relative: (225/240) (240/240); \
323 image.normal: "efm_generic_icon_shadow_empty.png"; \
324 } \
325 } \
326 part { name: "base"; mouse_events: 0; \
327 description { state: "default" 0.0; \
328 rel1.to: "spacer"; \
329 rel1.relative: (30/240) (15/240); \
330 rel2.to: "spacer"; \
331 rel2.relative: (210/240) (225/240); \
332 image.normal: "efm_generic_icon_base_empty.png"; \
333 } \
334 } \
335 part { name: "content"; mouse_events: 0; \
336 description { state: "default" 0.0; \
337 rel1.to: "base"; \
338 rel1.relative: (28/180) (28/210); \
339 rel2.to: "base"; \
340 rel2.relative: (152/180) (182/210); \
341 align: 0.5 _VALIGN; \
342 aspect: _ASPMIN _ASPMAX; aspect_preference: BOTH; \
343 image.normal: _IMAGE; \
344 } \
345 } \
346 part { name: "over"; mouse_events: 0; \
347 description { state: "default" 0.0; \
348 rel1.to: "base"; \
349 rel2.to: "base"; \
350 image.normal: "efm_generic_icon_over_empty.png"; \
351 } \
352 } \
353 } \
354 }
355
356//Libraries//
357
358 EFM_MIME_ICON_SIMPLE("application/x-sharedlib","efm_generic_icon_content_lib.png", (114/114), (114/114), 240, 0.5);
359 EFM_MIME_ICON_SIMPLE("application/x-shared-library-la","efm_generic_icon_content_lib.png", (114/114), (114/114), 240, 0.5);
360
361//Unknown//
362
363 EFM_MIME_ICON_SIMPLE("application/x-object","efm_generic_icon_content_unknown.png", (100/154), (100/154), 240, 0.5);
364
365//Install//
366
367 EFM_MIME_ICON_SIMPLE("application/x-install-instructions","efm_generic_icon_content_install.png",(114/149), (114/149), 240, 0.5);
368
369//Cache//
370
371 EFM_MIME_ICON_SIMPLE("chemical/x-cache","efm_generic_icon_content_db.png", (114/128), (114/128), 240, 0.5);
372
373#undefine EFM_MIME_ICON
374#undefine EFM_MIME_ICON_SIMPLE
375
376 /* #define EFMICON(NAME, FILE, SIZE) \
377 * group { name: "e/icons/fileman/"NAME; \
378 * max: SIZE SIZE; \
379 * parts { \
380 * part { name: "icon"; \
381 * mouse_events: 0; \
382 * description { state: "default" 0.0; \
383 * aspect: 1.0 1.0; \
384 * aspect_preference: BOTH; \
385 * image.image: FILE COMP; \
386 * image.normal: FILE ; \
387 * } \
388 * } \
389 * } \
390 * } */
391 //EFMICON("folder","icon_efm_folder.png", 128)
392 //EFMICON("chrdev","icon_efm_file.png", 128)
393 //EFMICON("blkdev","icon_efm_file.png", 128)
394 //EFMICON("fifo","icon_efm_file.png", 128)
395 //EFMICON("socket","icon_efm_file.png", 128)
396 //EFMICON("executable","icon_efm_file.png", 128)
397 //EFMICON("home","icon_efm_home.png", 128)
398 //EFMICON("root","icon_efm_root.png", 128)
399 //EFMICON("tmp","icon_efm_tmp.png", 128)
400 //EFMICON("desktop","icon_efm_desktop.png", 128)
401 //EFMICON("hdd","icon_efm_hdd.png", 128)
402 //EFMICON("hd","icon_efm_hdd.png", 128)
403
404 // EFM Mime type icons //
405
406 #define MIMEICON(NAME, FILE, SIZE) \
407 group { \
408 name: "e/icons/fileman/mime/"NAME; \
409 max: SIZE SIZE; \
410 parts { \
411 part { \
412 name: "icon"; \
413 mouse_events: 0; \
414 description { \
415 state: "default" 0.0; \
416 aspect: 1.0 1.0; \
417 aspect_preference: BOTH; \
418 image.image: "O/"FILE COMP; \
419 image.normal: "O/"FILE ; \
420 } \
421 } \
422 } \
423 }
424
425 MIMEICON("application/x-deb","icon_mime_deb.png", 128);
426
427 2
diff --git a/data/elementary/themes/edc/clock.edc b/data/elementary/themes/edc/clock.edc
index 633a1afe2a..8e75d6c61a 100644
--- a/data/elementary/themes/edc/clock.edc
+++ b/data/elementary/themes/edc/clock.edc
@@ -739,6 +739,7 @@ group { name: "e/modules/clock/calendar/day";
739 color: 160 160 160 255; 739 color: 160 160 160 255;
740 rel1.offset: 3 3; 740 rel1.offset: 3 3;
741 rel2.offset: -4 -4; 741 rel2.offset: -4 -4;
742 offscale;
742 text { font: FN; size: 10; 743 text { font: FN; size: 10;
743 text: "00"; 744 text: "00";
744 min: 1 1; 745 min: 1 1;
diff --git a/data/elementary/themes/edc/efl/bg.edc b/data/elementary/themes/edc/efl/bg.edc
index b494e60cd1..50be1caa46 100644
--- a/data/elementary/themes/edc/efl/bg.edc
+++ b/data/elementary/themes/edc/efl/bg.edc
@@ -13,7 +13,6 @@ Group: efl/bg (@since 1.23)
13 13
14group { "efl/bg"; 14group { "efl/bg";
15 data.item: "version" "123"; 15 data.item: "version" "123";
16 images.image: "bevel_dark_out.png" COMP;
17 parts { 16 parts {
18 part { name: "clipper"; type: RECT; 17 part { name: "clipper"; type: RECT;
19 description { state: "default" 0.0; 18 description { state: "default" 0.0;
@@ -21,7 +20,6 @@ group { "efl/bg";
21 } 20 }
22 part { name: "base"; type: RECT; 21 part { name: "base"; type: RECT;
23 description { state: "default" 0.0; 22 description { state: "default" 0.0;
24 color_class: "dialog_base";
25 color: 64 64 64 255; 23 color: 64 64 64 255;
26 } 24 }
27 } 25 }
@@ -35,14 +33,6 @@ group { "efl/bg";
35 fixed: 1 1; 33 fixed: 1 1;
36 } 34 }
37 } 35 }
38 part { name: "bevel";
39 description { state: "default" 0.0;
40 image.normal: "bevel_dark_out.png";
41 image.border: 1 1 1 1;
42 image.middle: 0;
43 fill.smooth: 0;
44 }
45 }
46 part { name: "efl.content"; type: SWALLOW; required; 36 part { name: "efl.content"; type: SWALLOW; required;
47 description { state: "default" 0.0; 37 description { state: "default" 0.0;
48 } 38 }
diff --git a/data/elementary/themes/edc/efl/border.edc b/data/elementary/themes/edc/efl/border.edc
index 71ec6d2e7f..475b96f405 100644
--- a/data/elementary/themes/edc/efl/border.edc
+++ b/data/elementary/themes/edc/efl/border.edc
@@ -8,28 +8,52 @@
8 */ 8 */
9 9
10group { "efl/border"; data.item: "version" "123"; 10group { "efl/border"; data.item: "version" "123";
11 images.image: "vgrad_med_lighter.png" COMP; 11 images.image: "win_shad_flat.png" COMP;
12 images.image: "vgrad_med_dark.png" COMP;
13 images.image: "bevel_out.png" COMP;
14 images.image: "shine.png" COMP;
15 images.image: "bevel_dark_out.png" COMP;
16 images.image: "sym_close_dark_normal.png" COMP;
17 images.image: "sym_close_dark_selected.png" COMP;
18 images.image: "sym_close_light_normal.png" COMP;
19 images.image: "sym_close_light_selected.png" COMP;
20 images.image: "sym_down_dark_normal.png" COMP;
21 images.image: "sym_down_dark_selected.png" COMP;
22 images.image: "sym_down_light_normal.png" COMP;
23 images.image: "sym_down_light_selected.png" COMP;
24 images.image: "sym_up_dark_normal.png" COMP;
25 images.image: "sym_up_dark_selected.png" COMP;
26 images.image: "sym_up_light_normal.png" COMP;
27 images.image: "sym_up_light_selected.png" COMP;
28 images.image: "glow_round_corners_small.png" COMP;
29 images.image: "knob_round_small_busy.png" COMP;
30 images.image: "screen_circular_shadow.png" COMP;
31 images.image: "win_shadow.png" COMP;
32 data.item: "shadow" "1"; 12 data.item: "shadow" "1";
13#define BORDERLESS 1
14#define MAXIMIZED 2
15#define UNRESIZABLE 4
16#define SET_MODE(a) script { new m = get_int(border_mode); m |= (a); set_int(border_mode, m); eval_mode(m); }
17#define UNSET_MODE(a) script { new m = get_int(border_mode); m &= ~(a); set_int(border_mode, m); eval_mode(m); }
18
19#define INDICATOR_TYPE_UNKNOWN 0
20#define INDICATOR_TYPE_BG_OPAQUE 1
21#define INDICATOR_TYPE_BG_TRANSPARENT 2
22#define INDICATOR_TYPE_HIDDEN 3
23 script {
24 public hide_shadow;
25 public show_menu;
26 public eval_shadow_menu() {
27 new m_show = get_int(show_menu);
28 new s_hide = get_int(hide_shadow);
29
30 if (s_hide) {
31 set_state(PART:"shadow_clip", "hidden", 0.0);
32 set_state(PART:"shadow_base", "hidden", 0.0);
33 } else {
34 set_state(PART:"shadow_clip", "default", 0.0);
35 set_state(PART:"shadow_base", "default", 0.0);
36 }
37 if ((m_show)/* && (s_hide)*/) {
38 set_state(PART:"efl.menu", "visible", 0.0);
39 } else {
40 set_state(PART:"efl.menu", "default", 0.0);
41 }
42 }
43
44 public border_mode;
45 public indicator_type = 0;
46 public indicator_enabled = 0;
47 public eval_mode(m) {
48 if (m & (BORDERLESS | MAXIMIZED | UNRESIZABLE)) {
49 set_state(PART:"bottom_clip", "hidden", 0.0);
50 set_state(PART:"top_resize_clip", "hidden", 0.0);
51 } else {
52 set_state(PART:"bottom_clip", "default", 0.0);
53 set_state(PART:"top_resize_clip", "default", 0.0);
54 }
55 }
56 }
33 parts { 57 parts {
34 /* opaque region of the window, to inform the compositor */ 58 /* opaque region of the window, to inform the compositor */
35 spacer { "efl.spacer.opaque"; 59 spacer { "efl.spacer.opaque";
@@ -49,9 +73,17 @@ group { "efl/border"; data.item: "version" "123";
49 rel2.relative: 1.0 0.0; 73 rel2.relative: 1.0 0.0;
50 } 74 }
51 } 75 }
52 /* shadow spacer and clipper */ 76 part { name: "shadow_clip"; type: RECT; mouse_events: 0;
53 spacer { "shadow_spacer"; 77 description { state: "default";
54 desc { "default"; 78 rel.to: "_sh1";
79 }
80 description { state: "hidden";
81 visible: 0;
82 }
83 }
84 part { name: "shadow_base"; type: SPACER;
85 scale: 1;
86 description { state: "default" 0.0;
55 WIN_SHADOW_SPACER; 87 WIN_SHADOW_SPACER;
56 } 88 }
57 desc { "hidden"; 89 desc { "hidden";
@@ -59,16 +91,9 @@ group { "efl/border"; data.item: "version" "123";
59 rel2.offset: -1 -1; 91 rel2.offset: -1 -1;
60 } 92 }
61 } 93 }
62 image { "shadow"; nomouse; 94 WIN_SHAD("shadow_base", "shadow_clip", "win_shad_flat.png", 21, 21, 14, 28, 0.5)
63 desc { "default";
64 rel.to: "shadow_spacer";
65 WIN_SHADOW;
66 }
67 desc { "hidden"; inherit: "default"; hid; }
68 }
69 /* window background: solid color */ 95 /* window background: solid color */
70 rect { "bg_clip"; 96 rect { "bg_clip"; nomouse;
71 nomouse;
72 desc { "default"; 97 desc { "default";
73 rel1.to: "top_clip"; 98 rel1.to: "top_clip";
74 rel1.relative: 0.0 1.0; 99 rel1.relative: 0.0 1.0;
@@ -79,8 +104,10 @@ group { "efl/border"; data.item: "version" "123";
79 required; // @since 1.19 104 required; // @since 1.19
80 clip: "bg_clip"; 105 clip: "bg_clip";
81 desc { "default"; 106 desc { "default";
107// color: 64 64 64 255;
82 color: 255 255 255 255; 108 color: 255 255 255 255;
83 color_class: "elm/win/background"; // FIXME: color_class naming scheme 109 color_class: "elm/win/background"; // FIXME: color_class naming scheme
110 rel.to: "efl.spacer.content";
84 visible: 0; 111 visible: 0;
85 } 112 }
86 desc { "visible"; 113 desc { "visible";
@@ -92,21 +119,8 @@ group { "efl/border"; data.item: "version" "123";
92 swallow { "efl.background"; 119 swallow { "efl.background";
93 required; // @since 1.19 120 required; // @since 1.19
94 clip: "client_clip"; 121 clip: "client_clip";
95 }
96 image { "background_bevel";
97 desc { "default"; 122 desc { "default";
98 image {
99 normal: "bevel_dark_out.png";
100 border: 1 1 1 1;
101 middle: 0;
102 }
103 fill.smooth: 0;
104 rel.to: "efl.spacer.content"; 123 rel.to: "efl.spacer.content";
105 visible: 0;
106 }
107 desc { "visible";
108 inherit: "default";
109 visible: 1;
110 } 124 }
111 } 125 }
112 spacer { "indicator_spacer"; 126 spacer { "indicator_spacer";
@@ -127,18 +141,26 @@ group { "efl/border"; data.item: "version" "123";
127 color: 64 64 64 255; // FIXME: color_class 141 color: 64 64 64 255; // FIXME: color_class
128 align: 0.5 0.0; 142 align: 0.5 0.0;
129 rel.to: "efl.menu"; 143 rel.to: "efl.menu";
144 fixed: 1 1;
145 visible: 0;
130 } 146 }
131 } 147 }
132 swallow { "efl.menu"; required; 148 swallow { "efl.menu";
133 required: 1; // since 1.19 149 required: 1; // since 1.19
134 desc { "default"; 150 desc { "default";
135 rel.to: "indicator_spacer"; 151 rel.to: "top_clip";
136 rel1.relative: 0.0 1.0;
137 visible: 0; 152 visible: 0;
138 align: 0.5 0.0; 153 align: 0.5 1.0;
139 fixed: 1 1; 154 fixed: 1 1;
155 rel2.relative: 1.0 1.0;
156 rel1.offset: 0 -1;
157// debug...
158//min: 0 40;
140 } 159 }
141 desc { "visible"; inherit: "default"; 160 desc { "visible"; inherit: "default";
161 // GGGG
162 rel1.offset: 0 0;
163 align: 0.5 0.0;
142 visible: 1; 164 visible: 1;
143 fixed: 0 1; 165 fixed: 0 1;
144 } 166 }
@@ -165,6 +187,7 @@ group { "efl/border"; data.item: "version" "123";
165 clip: "client_clip"; 187 clip: "client_clip";
166 desc { "default"; 188 desc { "default";
167 rel.to: "client_spacer"; 189 rel.to: "client_spacer";
190 visible: 1;
168 } 191 }
169 } 192 }
170 193
@@ -189,16 +212,21 @@ group { "efl/border"; data.item: "version" "123";
189 212
190 /* top title bar - spacer and clipper */ 213 /* top title bar - spacer and clipper */
191 rect { "top_clip"; //nomouse; 214 rect { "top_clip"; //nomouse;
215 scale: 1;
192 desc { "default"; 216 desc { "default";
193 rel1.to: "shadow_spacer"; 217 rel1.to: "shadow_base";
194 rel2.to_y: "title2"; 218 rel2.to_x: "shadow_base";
195 rel2.to_x: "shadow_spacer"; 219 rel2.to_y: "efl.text.title";
220 rel2.offset: -1 2;
196 vis; 221 vis;
222 offscale;
197 } 223 }
198 desc { "hidden"; 224 desc { "hidden";
199 inherit: "default"; 225 inherit: "default";
226 rel.to: "";
200 rel1.relative: 0.0 0.0; 227 rel1.relative: 0.0 0.0;
201 rel2.to: "shadow_spacer"; 228 rel1.offset: 0 -1;
229 rel2.to: "shadow_base";
202 rel2.relative: 1.0 0.0; 230 rel2.relative: 1.0 0.0;
203 rel2.offset: -1 -1; 231 rel2.offset: -1 -1;
204 max: -1 0; 232 max: -1 0;
@@ -208,93 +236,48 @@ group { "efl/border"; data.item: "version" "123";
208 } 236 }
209 } 237 }
210 /* top title bar */ 238 /* top title bar */
211 image { "top"; nomouse; 239 part { name: "top"; type: RECT;
212 clip: "top_clip"; 240 clip: "top_clip";
213 desc { "default"; 241 description { state: "default" 0.0;
214 image.normal: "vgrad_med_lighter.png";
215 rel.to: "top_clip"; 242 rel.to: "top_clip";
216 fill.smooth: 0; 243 color: 64 64 64 255;
217 TILED_HORIZ(120)
218 color_class: "border_frame";
219 } 244 }
220 desc { "focused"; 245 description { state: "focused" 0.0;
221 inherit: "default"; 246 inherit: "default" 0.0;
222 image.normal: "vgrad_med_dark.png"; 247 color: 32 32 32 255;
223 color_class: "border_frame_active";
224 } 248 }
225 } 249 }
226 image { "bevel"; nomouse; 250 part { name: "efl.text.title"; type: TEXT; mouse_events: 0;
227 clip: "top_clip";
228 desc { "default";
229 image.normal: "bevel_out.png";
230 image.border: 1 1 1 1;
231 image.middle: 0;
232 rel.to: "top_clip";
233 fill.smooth: 0;
234 }
235 }
236 text { "efl.text.title"; nomouse;
237 scale: 1; 251 scale: 1;
238 effect: SHADOW BOTTOM;
239 clip: "top_clip"; 252 clip: "top_clip";
240 desc { "default"; 253 description { state: "default" 0.0;
241 rel1.relative: 1.0 0.0; 254 rel1.relative: 1.0 0.0;
242 rel1.offset: 1 3; 255 rel1.offset: 1 4;
243 rel1.to_x: "event.icon"; 256 rel1.to_x: "icon";
244 rel1.to_y: "shadow_spacer"; 257 rel1.to_y: "shadow_base";
245 rel2.relative: 0.0 0.0; 258 rel2.relative: 0.0 0.0;
246 rel2.offset: -2 3; 259 rel2.offset: -2 4;
247 rel2.to_x: "event.minimize"; 260 rel2.to_x: "event.minimize";
248 rel2.to_y: "shadow_spacer"; 261 rel2.to_y: "shadow_base";
249 align: 0.5 0.0; 262 align: 0.5 0.0;
250 color_class: "border_title"; 263 color: 160 160 160 255;
251 color3: 255 255 255 255; 264 min: 0 16;
252 text { font: FNBD; size: 10; 265 text { font: FNBD; size: 10;
253 text_class: "title_bar"; 266 text_class: "title_bar";
254 align: 0.5 0.0; 267 align: 0.5 0.0;
255 min: 0 1; 268 min: 0 1;
256 } 269 }
257 fixed: 0 1; 270 fixed: 0 1;
271 offscale;
258 } 272 }
259 desc { "focused"; 273 description { state: "focused" 0.0;
260 inherit: "default"; 274 inherit: "default" 0.0;
261 visible: 0; 275 color: 255 255 255 255;
262 }
263 }
264 text { "title2"; nomouse;
265 scale: 1;
266 effect: SOFT_SHADOW BOTTOM;
267 clip: "top_clip";
268 desc { "default";
269 rel1.relative: 1.0 0.0;
270 rel1.offset: 1 2;
271 rel1.to_x: "event.icon";
272 rel1.to_y: "shadow_spacer";
273 rel2.relative: 0.0 0.0;
274 rel2.offset: -1 2;
275 rel2.to_x: "event.minimize";
276 rel2.to_y: "shadow_spacer";
277 align: 0.5 0.0;
278 color_class: "border_title_active";
279 color3: 255 255 255 255;
280 text { font: FNBD; size: 10;
281 text_source: "efl.text.title";
282 text_class: "title_bar";
283 align: 0.5 0.0;
284 min: 0 1;
285 }
286 fixed: 0 1;
287 visible: 0;
288 }
289 desc { "focused";
290 inherit: "default";
291 visible: 1;
292 } 276 }
293 } 277 }
294 spacer { "icon"; 278 spacer { "icon";
295 desc { "default"; 279 desc { "default";
296 rel1.to: "event.icon"; 280 rel.to: "event.icon";
297 rel2.to: "event.icon";
298 } 281 }
299 desc { "bounce1"; 282 desc { "bounce1";
300 inherit: "default"; 283 inherit: "default";
@@ -307,7 +290,7 @@ group { "efl/border"; data.item: "version" "123";
307 rel2.relative: 1.2 1.2; 290 rel2.relative: 1.2 1.2;
308 } 291 }
309 } 292 }
310 swallow { "efl.icon"; nomouse; required; 293 swallow { "efl.icon"; nomouse;
311 clip_to: "top_clip"; 294 clip_to: "top_clip";
312 desc { "default"; 295 desc { "default";
313 rel1.to: "icon"; 296 rel1.to: "icon";
@@ -317,54 +300,9 @@ group { "efl/border"; data.item: "version" "123";
317 rel2.offset: 0 0; 300 rel2.offset: 0 0;
318 } 301 }
319 } 302 }
320 rect { "busy_clip"; nomouse;
321 desc { "default";
322 color: 255 255 255 0;
323 visible: 0;
324 }
325 desc { "hung";
326 inherit: "default";
327 color: 255 255 255 255;
328 visible: 1;
329 }
330 }
331 image { "knob"; nomouse;
332 clip: "busy_clip";
333 desc { "default";
334 fixed: 1 1;
335 image.normal: "knob_round_small_busy.png";
336 aspect: 1.0 1.0; aspect_preference: VERTICAL;
337 max: 20 20;
338 rel1.relative: 1.0 0.0;
339 rel1.offset: 2 -0;
340 rel1.to: "event.icon";
341 rel2.relative: 1.0 1.0;
342 rel2.offset: 2 -1;
343 rel2.to: "event.icon";
344 align: 0.0 0.5;
345 fixed: 1 1;
346 }
347 }
348 image { "knob_spinner"; nomouse;
349 clip: "busy_clip";
350 desc { "default";
351 fixed: 1 1;
352 rel1.to: "knob";
353 rel2.to: "knob";
354 image.normal: "glow_round_corners_small.png";
355 map.on: 1;
356 map.smooth: 1;
357 map.rotation.center: "knob";
358 }
359 desc { "spin";
360 inherit: "default";
361 map.rotation.z: 360;
362 }
363 }
364 rect { "clip1"; nomouse; 303 rect { "clip1"; nomouse;
365 desc { "default"; 304 desc { "default";
366 rel1.to: "top_clip"; 305 rel.to: "top_clip";
367 rel2.to: "top_clip";
368 } 306 }
369 desc { "focused"; 307 desc { "focused";
370 inherit: "default"; 308 inherit: "default";
@@ -373,8 +311,7 @@ group { "efl/border"; data.item: "version" "123";
373 } 311 }
374 rect { "clip2"; nomouse; 312 rect { "clip2"; nomouse;
375 desc { "default"; 313 desc { "default";
376 rel1.to: "top_clip"; 314 rel.to: "top_clip";
377 rel2.to: "top_clip";
378 visible: 0; 315 visible: 0;
379 } 316 }
380 desc { "focused"; 317 desc { "focused";
@@ -384,92 +321,92 @@ group { "efl/border"; data.item: "version" "123";
384 } 321 }
385 image { "close1"; nomouse; 322 image { "close1"; nomouse;
386 clip: "clip1"; 323 clip: "clip1";
324 scale: 1;
387 desc { "default"; 325 desc { "default";
388 image.normal: "sym_close_dark_normal.png"; 326 image.normal: "i-close";
389 rel1.to: "event.close"; 327 rel.to: "event.close";
390 rel2.to: "event.close"; 328 min: 15 15; max: 15 15;
391 min: 15 15;
392 max: 15 15;
393 fixed: 1 1; 329 fixed: 1 1;
330 color: 160 160 160 255;
394 } 331 }
395 desc { "selected"; 332 desc { "selected";
396 inherit: "default"; 333 inherit: "default";
397 image.normal: "sym_close_dark_selected.png"; 334 color: 255 255 255 255;
398 } 335 }
399 } 336 }
400 image { "max1"; nomouse; 337 image { "max1"; nomouse;
401 clip: "clip1"; 338 clip: "clip1";
339 scale: 1;
402 desc { "default"; 340 desc { "default";
403 image.normal: "sym_up_dark_normal.png"; 341 image.normal: "i-arrow-u";
404 rel1.to: "event.maximize"; 342 rel.to: "event.maximize";
405 rel2.to: "event.maximize"; 343 min: 15 15; max: 15 15;
406 min: 15 15;
407 max: 15 15;
408 fixed: 1 1; 344 fixed: 1 1;
345 color: 160 160 160 255;
409 } 346 }
410 desc { "selected"; 347 desc { "selected";
411 inherit: "default"; 348 inherit: "default";
412 image.normal: "sym_up_dark_selected.png"; 349 color: 255 255 255 255;
413 } 350 }
414 } 351 }
415 image { "min1"; nomouse; 352 image { "min1"; nomouse;
416 clip: "clip1"; 353 clip: "clip1";
354 scale: 1;
417 desc { "default"; 355 desc { "default";
418 image.normal: "sym_down_dark_normal.png"; 356 image.normal: "i-arrow-d";
419 rel1.to: "event.minimize"; 357 rel.to: "event.minimize";
420 rel2.to: "event.minimize"; 358 min: 15 15; max: 15 15;
421 min: 15 15;
422 max: 15 15;
423 fixed: 1 1; 359 fixed: 1 1;
360 color: 160 160 160 255;
424 } 361 }
425 desc { "selected"; 362 desc { "selected";
426 inherit: "default"; 363 inherit: "default";
427 image.normal: "sym_down_dark_selected.png"; 364 color: 255 255 255 255;
428 } 365 }
429 } 366 }
430 image { "close2"; nomouse; 367 image { "close2"; nomouse;
431 clip: "clip2"; 368 clip: "clip2";
369 scale: 1;
432 desc { "default"; 370 desc { "default";
433 image.normal: "sym_close_light_normal.png"; 371 image.normal: "i-close";
434 rel1.to: "event.close"; 372 rel.to: "event.close";
435 rel2.to: "event.close"; 373 min: 15 15; max: 15 15;
436 min: 15 15;
437 max: 15 15;
438 fixed: 1 1; 374 fixed: 1 1;
375 color: 255 255 255 255;
439 } 376 }
440 desc { "selected"; 377 desc { "selected";
441 inherit: "default"; 378 inherit: "default";
442 image.normal: "sym_close_light_selected.png"; 379 color: 220 220 220 255;
443 } 380 }
444 } 381 }
445 image { "max2"; nomouse; 382 image { "max2"; nomouse;
446 clip: "clip2"; 383 clip: "clip2";
384 scale: 1;
447 desc { "default"; 385 desc { "default";
448 image.normal: "sym_up_light_normal.png"; 386 image.normal: "i-arrow-u";
449 rel1.to: "event.maximize"; 387 rel.to: "event.maximize";
450 rel2.to: "event.maximize"; 388 min: 15 15; max: 15 15;
451 min: 15 15;
452 max: 15 15;
453 fixed: 1 1; 389 fixed: 1 1;
390 color: 255 255 255 255;
454 } 391 }
455 desc { "selected"; 392 desc { "selected";
456 inherit: "default"; 393 inherit: "default";
457 image.normal: "sym_up_light_selected.png"; 394 color: 220 220 220 255;
458 } 395 }
459 } 396 }
460 image { "min2"; nomouse; 397 image { "min2"; nomouse;
461 clip: "clip2"; 398 clip: "clip2";
399 scale: 1;
462 desc { "default"; 400 desc { "default";
463 image.normal: "sym_down_light_normal.png"; 401 image.normal: "i-arrow-d";
464 rel1.to: "event.minimize"; 402 rel.to: "event.minimize";
465 rel2.to: "event.minimize"; 403 min: 15 15; max: 15 15;
466 min: 15 15;
467 max: 15 15;
468 fixed: 1 1; 404 fixed: 1 1;
405 color: 255 255 255 255;
469 } 406 }
470 desc { "selected"; 407 desc { "selected";
471 inherit: "default"; 408 inherit: "default";
472 image.normal: "sym_down_light_selected.png"; 409 color: 220 220 220 255;
473 } 410 }
474 } 411 }
475 rect { "event.icon"; 412 rect { "event.icon";
@@ -545,11 +482,13 @@ group { "efl/border"; data.item: "version" "123";
545 } 482 }
546 rect { "efl.event.resize.tl"; 483 rect { "efl.event.resize.tl";
547 clip: "top_resize_clip"; 484 clip: "top_resize_clip";
485 scale: 1;
548 desc { "default"; 486 desc { "default";
549 rel.to: "top_clip"; 487 rel.to: "top_clip";
550 rel2.relative: 0.0 0.0; 488 rel2.relative: 0.0 0.0;
551 min: 32 4; 489 rel2.offset: 31 3;
552 align: 0.0 0.0; 490 min: 40 6;
491 align: 1.0 1.0;
553 color: 0 0 0 0; 492 color: 0 0 0 0;
554 fixed: 1 1; 493 fixed: 1 1;
555 } 494 }
@@ -557,15 +496,14 @@ group { "efl/border"; data.item: "version" "123";
557 } 496 }
558 rect { "efl.event.resize.t"; 497 rect { "efl.event.resize.t";
559 clip: "top_resize_clip"; 498 clip: "top_resize_clip";
499 scale: 1;
560 desc { "default"; 500 desc { "default";
501 rel1.to: "efl.event.resize.tl";
561 rel1.relative: 1.0 0.0; 502 rel1.relative: 1.0 0.0;
562 rel1.to_y: "top_clip"; 503 rel2.to: "efl.event.resize.tr";
563 rel1.to_x: "efl.event.resize.tl"; 504 rel2.relative: 0.0 1.0;
564 rel2.relative: 0.0 0.0; 505 min: 0 6;
565 rel2.to_x: "efl.event.resize.tr"; 506 align: 0.5 1.0;
566 rel2.to_y: "top_clip";
567 min: 0 4;
568 align: 0.5 0.0;
569 color: 0 0 0 0; 507 color: 0 0 0 0;
570 fixed: 1 1; 508 fixed: 1 1;
571 } 509 }
@@ -573,12 +511,15 @@ group { "efl/border"; data.item: "version" "123";
573 } 511 }
574 rect { "efl.event.resize.tr"; 512 rect { "efl.event.resize.tr";
575 clip: "top_resize_clip"; 513 clip: "top_resize_clip";
514 scale: 1;
576 desc { "default"; 515 desc { "default";
577 rel.to: "top_clip"; 516 rel.to: "top_clip";
578 rel1.relative: 1.0 0.0; 517 rel1.relative: 1.0 0.0;
518 rel1.offset: -32 0;
579 rel2.relative: 1.0 0.0; 519 rel2.relative: 1.0 0.0;
580 min: 32 4; 520 rel2.offset: -1 3;
581 align: 1.0 0.0; 521 min: 40 6;
522 align: 0.0 1.0;
582 color: 0 0 0 0; 523 color: 0 0 0 0;
583 fixed: 1 1; 524 fixed: 1 1;
584 } 525 }
@@ -594,94 +535,76 @@ group { "efl/border"; data.item: "version" "123";
594 } 535 }
595 } 536 }
596 rect { "bottom_clip"; 537 rect { "bottom_clip";
538 scale: 1;
597 desc { "default"; 539 desc { "default";
598 rel.to: "shadow_spacer"; 540 rel.to: "shadow_base";
599 rel1 { relative: 0.0 1.0; offset: 0 -5; } 541 rel1 { relative: 0.0 1.0; offset: 0 -1; }
542 align: 0.0 1.0;
600 min: 0 5; 543 min: 0 5;
601 fixed: 0 1; 544 fixed: 0 1;
602 } 545 }
603 desc { "hidden"; 546 desc { "hidden";
604 inherit: "default"; 547 inherit: "default";
605 rel1 { relative: 0.0 1.0; offset: 0 0; } 548 rel1 { relative: 0.0 1.0; offset: 0 0; }
549 rel2 { relative: 1.0 1.0; offset: 0 0; }
606 min: 0 0; 550 min: 0 0;
607 hid; 551 hid;
608 } 552 }
609 } 553 }
610 rect { "bottom"; 554 part { name: "bottom"; type: RECT; mouse_events: 0;
611 nomouse;
612 desc { "default";
613 color_class: "border_bottom";
614 color: 64 64 64 255; /* FIXME */
615 rel.to: "bottom_clip";
616 }
617 }
618 image { "bevel2"; nomouse;
619 clip: "bottom_clip"; 555 clip: "bottom_clip";
620 desc { "default"; 556 description { state: "default" 0.0;
621 image.normal: "bevel_dark_out.png"; 557 color: 64 64 64 255;
622 image.border: 1 1 1 1;
623 image.middle: 0;
624 rel.to: "bottom_clip"; 558 rel.to: "bottom_clip";
625 fill.smooth: 0;
626 } 559 }
627 } 560 }
561
628 rect { "efl.event.resize.bl"; 562 rect { "efl.event.resize.bl";
629 clip: "bottom_clip"; 563 clip: "bottom_clip";
564 scale: 1;
630 desc { "default"; 565 desc { "default";
631 rel1.relative: 0.0 1.0; 566 rel.to: "bottom_clip";
632 rel1.to: "bottom_clip";
633 rel2.relative: 0.0 1.0; 567 rel2.relative: 0.0 1.0;
634 rel2.to: "bottom_clip"; 568 rel2.offset: 31 -1;
635 min: 32 5; 569 min: 40 10;
636 align: 0.0 1.0; 570 align: 0.0 0.5;
637 color: 0 0 0 0; 571 color: 0 0 0 0;
638 fixed: 1 1; 572 fixed: 1 1;
573 offscale;
639 } 574 }
640 desc { "hidden"; inherit: "default"; hid; } 575 desc { "hidden"; inherit: "default"; hid; }
641 } 576 }
642 rect { "efl.event.resize.b"; 577 rect { "efl.event.resize.b";
643 clip: "bottom_clip"; 578 clip: "bottom_clip";
579 scale: 1;
644 desc { "default"; 580 desc { "default";
645 rel1.relative: 1.0 1.0; 581 rel1.to: "efl.event.resize.bl";
646 rel1.to_x: "efl.event.resize.tl"; 582 rel1.relative: 1.0 0.0;
647 rel1.to_y: "bottom_clip"; 583 rel2.to: "efl.event.resize.br";
648 rel1.offset: 0 -1;
649 rel2.relative: 0.0 1.0; 584 rel2.relative: 0.0 1.0;
650 rel2.to_x: "efl.event.resize.tr"; 585 min: 0 10;
651 rel2.to_y: "bottom_clip"; 586 align: 0.5 0.5;
652 min: 0 5;
653 align: 0.5 1.0;
654 color: 0 0 0 0; 587 color: 0 0 0 0;
655 fixed: 0 1; 588 fixed: 1 1;
589 offscale;
656 } 590 }
657 desc { "hidden"; inherit: "default"; hid; } 591 desc { "hidden"; inherit: "default"; hid; }
658 } 592 }
659 rect { "efl.event.resize.br"; 593 rect { "efl.event.resize.br";
660 clip: "bottom_clip"; 594 clip: "bottom_clip";
595 scale: 1;
661 desc { "default"; 596 desc { "default";
662 rel1.relative: 1.0 1.0; 597 rel.to: "bottom_clip";
663 rel1.to: "bottom_clip"; 598 rel1.relative: 1.0 0.0;
664 rel2.relative: 1.0 1.0; 599 rel1.offset: -32 0;
665 rel2.to: "bottom_clip"; 600 min: 40 10;
666 min: 32 5; 601 align: 0.0 0.5;
667 align: 1.0 1.0;
668 color: 0 0 0 0; 602 color: 0 0 0 0;
669 fixed: 1 1; 603 fixed: 1 1;
604 offscale;
670 } 605 }
671 desc { "hidden"; inherit: "default"; hid; } 606 desc { "hidden"; inherit: "default"; hid; }
672 } 607 }
673 /* top title bar decoration */
674 image { "shine"; nomouse;
675 clip: "top_clip";
676 desc { "default";
677 image.normal: "shine.png";
678 rel.to: "top_clip";
679 rel1.offset: 0 -2;
680 rel2.relative: 1.0 0.0;
681 rel2.offset: -1 2;
682 FIXED_SIZE(69, 5)
683 }
684 }
685 rect { "indicator_bg"; 608 rect { "indicator_bg";
686 clip: "bg_clip"; 609 clip: "bg_clip";
687 desc { "default"; 610 desc { "default";
@@ -693,7 +616,7 @@ group { "efl/border"; data.item: "version" "123";
693 color: 0 0 0 0; 616 color: 0 0 0 0;
694 } 617 }
695 } 618 }
696 swallow { "efl.indicator"; required; 619 swallow { "efl.indicator";
697 clip: "bg_clip"; 620 clip: "bg_clip";
698 desc { "default"; 621 desc { "default";
699 rel.to: "top_clip"; 622 rel.to: "top_clip";
@@ -712,41 +635,14 @@ group { "efl/border"; data.item: "version" "123";
712 } 635 }
713 } 636 }
714 637
715#define BORDERLESS 1
716#define MAXIMIZED 2
717#define UNRESIZABLE 4
718#define SET_MODE(a) script { new m = get_int(border_mode); m |= (a); set_int(border_mode, m); eval_mode(m); }
719#define UNSET_MODE(a) script { new m = get_int(border_mode); m &= ~(a); set_int(border_mode, m); eval_mode(m); }
720
721#define INDICATOR_TYPE_UNKNOWN 0
722#define INDICATOR_TYPE_BG_OPAQUE 1
723#define INDICATOR_TYPE_BG_TRANSPARENT 2
724#define INDICATOR_TYPE_HIDDEN 3
725
726 programs { 638 programs {
727 script { 639 program { signal: "efl,state,borderless,on"; source: "efl";
728 public border_mode;
729 public indicator_type = 0;
730 public indicator_enabled = 0;
731 public eval_mode(m) {
732 if (m & (BORDERLESS | MAXIMIZED | UNRESIZABLE)) {
733 set_state(PART:"bottom_clip", "hidden", 0.0);
734 set_state(PART:"top_resize_clip", "hidden", 0.0);
735 } else {
736 set_state(PART:"bottom_clip", "default", 0.0);
737 set_state(PART:"top_resize_clip", "default", 0.0);
738 }
739 }
740 }
741 program {
742 signal: "efl,state,borderless,on"; source: "efl";
743 action: STATE_SET "hidden"; 640 action: STATE_SET "hidden";
744 targets: "top_clip" "bottom_clip"; 641 targets: "top_clip" "bottom_clip";
745 after: "borderless,on"; 642 after: "borderless,on";
746 } 643 }
747 program { "borderless,on"; SET_MODE(BORDERLESS); } 644 program { "borderless,on"; SET_MODE(BORDERLESS); }
748 program { 645 program { signal: "efl,state,borderless,off"; source: "efl";
749 signal: "efl,state,borderless,off"; source: "efl";
750 action: STATE_SET "default"; 646 action: STATE_SET "default";
751 targets: "top_clip" "bottom_clip"; 647 targets: "top_clip" "bottom_clip";
752 after: "borderless,off"; 648 after: "borderless,off";
@@ -756,60 +652,75 @@ group { "efl/border"; data.item: "version" "123";
756 signal: "efl,state,unresizable,on"; source: "efl"; 652 signal: "efl,state,unresizable,on"; source: "efl";
757 SET_MODE(UNRESIZABLE); 653 SET_MODE(UNRESIZABLE);
758 } 654 }
759 program { 655 program { signal: "efl,state,unresizable,off"; source: "efl";
760 signal: "efl,state,unresizable,off"; source: "efl";
761 UNSET_MODE(UNRESIZABLE); 656 UNSET_MODE(UNRESIZABLE);
762 } 657 }
763 program { 658 program { signal: "efl,state,shadow,on"; source: "efl";
764 signal: "efl,state,shadow,on"; source: "efl"; 659 script {
765 action: STATE_SET "default"; 660 set_int(hide_shadow, 0);
766 targets: "shadow_spacer" "shadow"; 661 eval_shadow_menu();
662 }
663// action: STATE_SET "default";
664// target: "shadow_clip";
665// target: "shadow_base";
767 } 666 }
768 program { 667 program { signal: "efl,state,shadow,off"; source: "efl";
769 signal: "efl,state,shadow,off"; source: "efl"; 668 script {
770 action: STATE_SET "hidden"; 669 set_int(hide_shadow, 1);
771 targets: "shadow_spacer" "shadow"; 670 eval_shadow_menu();
671 }
672// action: STATE_SET "hidden";
673// target: "shadow_clip";
674// target: "shadow_base";
772 } 675 }
773 program { 676 /* application desktop menu */
774 signal: "efl,state,background,solid,on"; source: "efl"; 677 program { signal: "efl,action,show_menu"; source: "efl";
775 action: STATE_SET "visible"; 678 script {
776 target: "efl.rect.background"; 679 set_int(show_menu, 1);
680 eval_shadow_menu();
681 }
682// action: STATE_SET "visible";
683// target: "efl.menu";
777 } 684 }
778 program { 685 program { signal: "efl,action,hide"; source: "efl";
779 signal: "efl,state,background,solid,off"; source: "efl"; 686 script {
780 action: STATE_SET "default"; 687 set_int(show_menu, 0);
781 target: "efl.rect.background"; 688 eval_shadow_menu();
689 }
690// action: STATE_SET "default";
691// target: "efl.menu";
782 } 692 }
783 program { 693 program { signal: "efl,state,background,solid,on"; source: "efl";
784 signal: "efl,state,background,standard,on"; source: "efl";
785 action: STATE_SET "visible"; 694 action: STATE_SET "visible";
786 target: "background_bevel"; 695 target: "efl.rect.background";
787 } 696 }
788 program { 697 program { signal: "efl,state,background,solid,off"; source: "efl";
789 signal: "efl,state,background,standard,off"; source: "efl";
790 action: STATE_SET "default"; 698 action: STATE_SET "default";
791 target: "background_bevel"; 699 target: "efl.rect.background";
792 } 700 }
793 program { 701// program { signal: "efl,state,background,standard,on"; source: "efl";
794 signal: "efl,action,focus"; source: "efl"; 702// action: STATE_SET "visible";
703// target: "background_bevel";
704// }
705// program { signal: "efl,state,background,standard,off"; source: "efl";
706// action: STATE_SET "default";
707// target: "background_bevel";
708// }
709 program { signal: "efl,action,focus"; source: "efl";
795 action: STATE_SET "focused"; 710 action: STATE_SET "focused";
796 target: "top"; 711 target: "top";
797 target: "efl.text.title"; 712 target: "efl.text.title";
798 target: "title2";
799 target: "clip1"; 713 target: "clip1";
800 target: "clip2"; 714 target: "clip2";
801 } 715 }
802 program { 716 program { signal: "efl,action,unfocus"; source: "efl";
803 signal: "efl,action,unfocus"; source: "efl";
804 action: STATE_SET "default"; 717 action: STATE_SET "default";
805 target: "top"; 718 target: "top";
806 target: "efl.text.title"; 719 target: "efl.text.title";
807 target: "title2";
808 target: "clip1"; 720 target: "clip1";
809 target: "clip2"; 721 target: "clip2";
810 } 722 }
811 program { 723 program { signal: "efl,state,urgent"; source: "efl";
812 signal: "efl,state,urgent"; source: "efl";
813 action: STATE_SET "bounce1"; 724 action: STATE_SET "bounce1";
814 target: "icon"; 725 target: "icon";
815 after: "urg1"; 726 after: "urg1";
@@ -826,111 +737,64 @@ group { "efl/border"; data.item: "version" "123";
826 target: "icon"; 737 target: "icon";
827 after: "urg1"; 738 after: "urg1";
828 } 739 }
829 program { 740 program { signal: "efl,state,not_urgent"; source: "efl";
830 signal: "efl,state,not_urgent"; source: "efl";
831 action: STATE_SET "default"; 741 action: STATE_SET "default";
832 target: "icon"; 742 target: "icon";
833 } 743 }
834 program { name: "spin";
835 signal: "efl,state,hung"; source: "efl";
836 action: STATE_SET "spin";
837 transition: LINEAR 1.0;
838 target: "knob_spinner";
839 after: "spin2";
840 }
841 program { name: "spin2";
842 action: STATE_SET "default";
843 target: "knob_spinner";
844 after: "spin";
845 }
846 program {
847 signal: "efl,state,hung"; source: "efl";
848 action: STATE_SET "hung";
849 transition: SINUSOIDAL 0.25;
850 target: "busy_clip";
851 }
852 program {
853 signal: "efl,state,unhung"; source: "efl";
854 action: STATE_SET "default";
855 transition: SINUSOIDAL 1.0;
856 target: "busy_clip";
857 after: "spin3";
858 }
859 program { name: "spin3";
860 action: ACTION_STOP;
861 target: "spin";
862 target: "spin2";
863 after: "spin4";
864 }
865 program { name: "spin4";
866 action: STATE_SET "default";
867 target: "knob_spinner";
868 }
869 744
870 /* maximize & unmaximize */ 745 /* maximize & unmaximize */
871 program { 746 program { signal: "efl,state,maximize*"; source: "efl";
872 signal: "efl,state,maximize*"; source: "efl";
873 action: STATE_SET "max"; 747 action: STATE_SET "max";
874 target: "efl.spacer.opaque"; 748 target: "efl.spacer.opaque";
875 } 749 }
876 program { 750 program { signal: "efl,state,maximize*"; source: "efl";
877 signal: "efl,state,maximize*"; source: "efl";
878 SET_MODE(MAXIMIZED); 751 SET_MODE(MAXIMIZED);
879 } 752 }
880 program { 753 program { signal: "efl,state,unmaximize*"; source: "efl";
881 signal: "efl,state,unmaximize*"; source: "efl";
882 action: STATE_SET "default"; 754 action: STATE_SET "default";
883 target: "efl.spacer.opaque"; 755 target: "efl.spacer.opaque";
884 } 756 }
885 program { 757 program { signal: "efl,state,unmaximize*"; source: "efl";
886 signal: "efl,state,unmaximize*"; source: "efl";
887 UNSET_MODE(MAXIMIZED); 758 UNSET_MODE(MAXIMIZED);
888 } 759 }
889 760
890 /*indicator*/ 761 /*indicator*/
891 program { 762 program { signal: "efl,action,show_indicator"; source: "efl";
892 signal: "efl,action,show_indicator"; source: "efl";
893 script { 763 script {
894 set_int(indicator_enabled, 1); 764 set_int(indicator_enabled, 1);
895 } 765 }
896 after: "update_indicator"; 766 after: "update_indicator";
897 } 767 }
898 program { 768 program { signal: "efl,action,hide_indicator"; source: "efl";
899 signal: "efl,action,hide_indicator"; source: "efl";
900 script { 769 script {
901 set_int(indicator_enabled, 0); 770 set_int(indicator_enabled, 0);
902 } 771 }
903 after: "update_indicator"; 772 after: "update_indicator";
904 } 773 }
905 program { 774 program { signal: "efl,action,indicator,bg_opaque"; source: "efl";
906 signal: "efl,action,indicator,bg_opaque"; source: "efl";
907 script { 775 script {
908 set_int(indicator_type, INDICATOR_TYPE_BG_OPAQUE); 776 set_int(indicator_type, INDICATOR_TYPE_BG_OPAQUE);
909 } 777 }
910 after: "update_indicator"; 778 after: "update_indicator";
911 } 779 }
912 program { 780 program { signal: "efl,action,indicator,bg_transparent"; source: "efl";
913 signal: "efl,action,indicator,bg_transparent"; source: "efl";
914 script { 781 script {
915 set_int(indicator_type, INDICATOR_TYPE_BG_TRANSPARENT); 782 set_int(indicator_type, INDICATOR_TYPE_BG_TRANSPARENT);
916 } 783 }
917 after: "update_indicator"; 784 after: "update_indicator";
918 } 785 }
919 program { 786 program { signal: "efl,action,indicator,hidden"; source: "efl";
920 signal: "efl,action,indicator,hidden"; source: "efl";
921 script { 787 script {
922 set_int(indicator_type, INDICATOR_TYPE_HIDDEN); 788 set_int(indicator_type, INDICATOR_TYPE_HIDDEN);
923 } 789 }
924 after: "update_indicator"; 790 after: "update_indicator";
925 } 791 }
926 program { 792 program { signal: "efl,action,indicator,show_effect"; source: "efl";
927 signal: "efl,action,indicator,show_effect"; source: "efl";
928 action: STATE_SET "visible"; 793 action: STATE_SET "visible";
929 transition: DECELERATE 0.2; 794 transition: DECELERATE 0.2;
930 target: "efl.indicator"; 795 target: "efl.indicator";
931 } 796 }
932 program { 797 program { signal: "efl,action,indicator,hide_effect"; source: "efl";
933 signal: "efl,action,indicator,hide_effect"; source: "efl";
934 action: STATE_SET "hidden"; 798 action: STATE_SET "hidden";
935 transition: DECELERATE 0.2; 799 transition: DECELERATE 0.2;
936 target: "efl.indicator"; 800 target: "efl.indicator";
@@ -953,177 +817,132 @@ group { "efl/border"; data.item: "version" "123";
953 set_state(PART:"indicator_bg", "default", 0.0); 817 set_state(PART:"indicator_bg", "default", 0.0);
954 } 818 }
955 } else { 819 } else {
956 set_state(PART:"efl.indicator", "default", 0.0); 820 set_state(PART:"efl.indicator", "default", 0.0);
957 set_state(PART:"indicator_spacer", "default", 0.0); 821 set_state(PART:"indicator_spacer", "default", 0.0);
958 } 822 }
959 } 823 }
960 } 824 }
961 825
962 /* application desktop menu */
963 program { name: "show_menu";
964 signal: "efl,action,show_menu"; source: "efl";
965 action: STATE_SET "visible";
966 target: "efl.menu";
967 }
968 program { name: "hide_menu";
969 signal: "efl,action,hide"; source: "efl";
970 action: STATE_SET "default";
971 target: "efl.menu";
972 }
973
974 /* modal windows */ 826 /* modal windows */
975 program { name: "hide_blocker"; 827 program { signal: "efl,action,hide_blocker"; source: "efl";
976 signal: "efl,action,hide_blocker"; source: "efl";
977 action: STATE_SET "default" 0.0; 828 action: STATE_SET "default" 0.0;
978 target: "rect.blocker"; 829 target: "rect.blocker";
979 transition: DECELERATE 0.2; 830 transition: DECELERATE 0.2;
980 } 831 }
981 program { name: "show_blocker"; 832 program { signal: "efl,action,show_blocker"; source: "efl";
982 signal: "efl,action,show_blocker"; source: "efl";
983 action: STATE_SET "visible" 0.0; 833 action: STATE_SET "visible" 0.0;
984 target: "rect.blocker"; 834 target: "rect.blocker";
985 transition: DECELERATE 0.2; 835 transition: DECELERATE 0.2;
986 } 836 }
987 837
988 /* minimize, maximize & close buttons */ 838 /* minimize, maximize & close buttons */
989 program { 839 program { signal: "mouse,down,*"; source: "event.close";
990 signal: "mouse,down,*"; source: "event.close";
991 action: STATE_SET "selected"; 840 action: STATE_SET "selected";
992 target: "close1"; 841 target: "close1";
993 target: "close2"; 842 target: "close2";
994 } 843 }
995 program { 844 program { signal: "mouse,up,*"; source: "event.close";
996 signal: "mouse,up,*"; source: "event.close";
997 action: STATE_SET "default"; 845 action: STATE_SET "default";
998 target: "close1"; 846 target: "close1";
999 target: "close2"; 847 target: "close2";
1000 } 848 }
1001 program { 849 program { signal: "mouse,down,*"; source: "event.maximize";
1002 signal: "mouse,down,*"; source: "event.maximize";
1003 action: STATE_SET "selected"; 850 action: STATE_SET "selected";
1004 target: "max1"; 851 target: "max1";
1005 target: "max2"; 852 target: "max2";
1006 } 853 }
1007 program { 854 program { signal: "mouse,up,*"; source: "event.maximize";
1008 signal: "mouse,up,*"; source: "event.maximize";
1009 action: STATE_SET "default"; 855 action: STATE_SET "default";
1010 target: "max1"; 856 target: "max1";
1011 target: "max2"; 857 target: "max2";
1012 } 858 }
1013 program { 859 program { signal: "mouse,down,*"; source: "event.minimize";
1014 signal: "mouse,down,*"; source: "event.minimize";
1015 action: STATE_SET "selected"; 860 action: STATE_SET "selected";
1016 target: "min1"; 861 target: "min1";
1017 target: "min2"; 862 target: "min2";
1018 } 863 }
1019 program { 864 program { signal: "mouse,up,*"; source: "event.minimize";
1020 signal: "mouse,up,*"; source: "event.minimize";
1021 action: STATE_SET "default"; 865 action: STATE_SET "default";
1022 target: "min1"; 866 target: "min1";
1023 target: "min2"; 867 target: "min2";
1024 } 868 }
1025 program { 869 program { signal: "mouse,down,1"; source: "event.titlebar";
1026 signal: "mouse,down,1"; source: "event.titlebar";
1027 action: SIGNAL_EMIT "efl,action,move,start" "efl"; 870 action: SIGNAL_EMIT "efl,action,move,start" "efl";
1028 } 871 }
1029 program { 872 program { signal: "mouse,up,1"; source: "event.titlebar";
1030 signal: "mouse,up,1"; source: "event.titlebar";
1031 action: SIGNAL_EMIT "efl,action,move,stop" "efl"; 873 action: SIGNAL_EMIT "efl,action,move,stop" "efl";
1032 } 874 }
1033 program { 875 program { signal: "mouse,clicked,1"; source: "event.minimize";
1034 signal: "mouse,clicked,1"; source: "event.minimize";
1035 action: SIGNAL_EMIT "efl,action,minimize" "efl"; 876 action: SIGNAL_EMIT "efl,action,minimize" "efl";
1036 } 877 }
1037 program { 878 program { signal: "mouse,clicked,1"; source: "event.maximize";
1038 signal: "mouse,clicked,1"; source: "event.maximize";
1039 action: SIGNAL_EMIT "efl,action,maximize" "efl"; 879 action: SIGNAL_EMIT "efl,action,maximize" "efl";
1040 } 880 }
1041 program { 881 program { signal: "mouse,clicked,1"; source: "event.close";
1042 signal: "mouse,clicked,1"; source: "event.close";
1043 action: SIGNAL_EMIT "efl,action,close" "efl"; 882 action: SIGNAL_EMIT "efl,action,close" "efl";
1044 } 883 }
1045 program { 884 program { signal: "mouse,in"; source: "efl.event.resize.t";
1046 signal: "mouse,in"; source: "efl.event.resize.t";
1047 action: SIGNAL_EMIT "efl,action,resize,show" "efl.event.resize.t"; 885 action: SIGNAL_EMIT "efl,action,resize,show" "efl.event.resize.t";
1048 } 886 }
1049 program { 887 program { signal: "mouse,out"; source: "efl.event.resize.t";
1050 signal: "mouse,out"; source: "efl.event.resize.t";
1051 action: SIGNAL_EMIT "efl,action,resize,hide" "efl.event.resize.t"; 888 action: SIGNAL_EMIT "efl,action,resize,hide" "efl.event.resize.t";
1052 } 889 }
1053 program { 890 program { signal: "mouse,down,1"; source: "efl.event.resize.t";
1054 signal: "mouse,down,1"; source: "efl.event.resize.t";
1055 action: SIGNAL_EMIT "efl,action,resize,start" "efl.event.resize.t"; 891 action: SIGNAL_EMIT "efl,action,resize,start" "efl.event.resize.t";
1056 } 892 }
1057 program { 893 program { signal: "mouse,in"; source: "efl.event.resize.b";
1058 signal: "mouse,in"; source: "efl.event.resize.b";
1059 action: SIGNAL_EMIT "efl,action,resize,show" "efl.event.resize.b"; 894 action: SIGNAL_EMIT "efl,action,resize,show" "efl.event.resize.b";
1060 } 895 }
1061 program { 896 program { signal: "mouse,out"; source: "efl.event.resize.b";
1062 signal: "mouse,out"; source: "efl.event.resize.b";
1063 action: SIGNAL_EMIT "efl,action,resize,hide" "efl.event.resize.b"; 897 action: SIGNAL_EMIT "efl,action,resize,hide" "efl.event.resize.b";
1064 } 898 }
1065 program { 899 program { signal: "mouse,down,1"; source: "efl.event.resize.b";
1066 signal: "mouse,down,1"; source: "efl.event.resize.b";
1067 action: SIGNAL_EMIT "efl,action,resize,start" "efl.event.resize.b"; 900 action: SIGNAL_EMIT "efl,action,resize,start" "efl.event.resize.b";
1068 } 901 }
1069 program { 902 program { signal: "mouse,in"; source: "efl.event.resize.tl";
1070 signal: "mouse,in"; source: "efl.event.resize.tl";
1071 action: SIGNAL_EMIT "efl,action,resize,show" "efl.event.resize.tl"; 903 action: SIGNAL_EMIT "efl,action,resize,show" "efl.event.resize.tl";
1072 } 904 }
1073 program { 905 program { signal: "mouse,out"; source: "efl.event.resize.tl";
1074 signal: "mouse,out"; source: "efl.event.resize.tl";
1075 action: SIGNAL_EMIT "efl,action,resize,hide" "efl.event.resize.tl"; 906 action: SIGNAL_EMIT "efl,action,resize,hide" "efl.event.resize.tl";
1076 } 907 }
1077 program { 908 program { signal: "mouse,down,1"; source: "efl.event.resize.tl";
1078 signal: "mouse,down,1"; source: "efl.event.resize.tl";
1079 action: SIGNAL_EMIT "efl,action,resize,start" "efl.event.resize.tl"; 909 action: SIGNAL_EMIT "efl,action,resize,start" "efl.event.resize.tl";
1080 } 910 }
1081 program { 911 program { signal: "mouse,in"; source: "efl.event.resize.tr";
1082 signal: "mouse,in"; source: "efl.event.resize.tr";
1083 action: SIGNAL_EMIT "efl,action,resize,show" "efl.event.resize.tr"; 912 action: SIGNAL_EMIT "efl,action,resize,show" "efl.event.resize.tr";
1084 } 913 }
1085 program { 914 program { signal: "mouse,out"; source: "efl.event.resize.tr";
1086 signal: "mouse,out"; source: "efl.event.resize.tr";
1087 action: SIGNAL_EMIT "efl,action,resize,hide" "efl.event.resize.tr"; 915 action: SIGNAL_EMIT "efl,action,resize,hide" "efl.event.resize.tr";
1088 } 916 }
1089 program { 917 program { signal: "mouse,down,1"; source: "efl.event.resize.tr";
1090 signal: "mouse,down,1"; source: "efl.event.resize.tr";
1091 action: SIGNAL_EMIT "efl,action,resize,start" "efl.event.resize.tr"; 918 action: SIGNAL_EMIT "efl,action,resize,start" "efl.event.resize.tr";
1092 } 919 }
1093 program { 920 program { signal: "mouse,in"; source: "efl.event.resize.bl";
1094 signal: "mouse,in"; source: "efl.event.resize.bl";
1095 action: SIGNAL_EMIT "efl,action,resize,show" "efl.event.resize.bl"; 921 action: SIGNAL_EMIT "efl,action,resize,show" "efl.event.resize.bl";
1096 } 922 }
1097 program { 923 program { signal: "mouse,out"; source: "efl.event.resize.bl";
1098 signal: "mouse,out"; source: "efl.event.resize.bl";
1099 action: SIGNAL_EMIT "efl,action,resize,hide" "efl.event.resize.bl"; 924 action: SIGNAL_EMIT "efl,action,resize,hide" "efl.event.resize.bl";
1100 } 925 }
1101 program { 926 program { signal: "mouse,down,1"; source: "efl.event.resize.bl";
1102 signal: "mouse,down,1"; source: "efl.event.resize.bl";
1103 action: SIGNAL_EMIT "efl,action,resize,start" "efl.event.resize.bl"; 927 action: SIGNAL_EMIT "efl,action,resize,start" "efl.event.resize.bl";
1104 } 928 }
1105 program { 929 program { signal: "mouse,in"; source: "efl.event.resize.br";
1106 signal: "mouse,in"; source: "efl.event.resize.br";
1107 action: SIGNAL_EMIT "efl,action,resize,show" "efl.event.resize.br"; 930 action: SIGNAL_EMIT "efl,action,resize,show" "efl.event.resize.br";
1108 } 931 }
1109 program { 932 program { signal: "mouse,out"; source: "efl.event.resize.br";
1110 signal: "mouse,out"; source: "efl.event.resize.br";
1111 action: SIGNAL_EMIT "efl,action,resize,hide" "efl.event.resize.br"; 933 action: SIGNAL_EMIT "efl,action,resize,hide" "efl.event.resize.br";
1112 } 934 }
1113 program { 935 program { signal: "mouse,down,1"; source: "efl.event.resize.br";
1114 signal: "mouse,down,1"; source: "efl.event.resize.br";
1115 action: SIGNAL_EMIT "efl,action,resize,start" "efl.event.resize.br"; 936 action: SIGNAL_EMIT "efl,action,resize,start" "efl.event.resize.br";
1116 } 937 }
1117 program { 938 program { signal: "mouse,clicked,1"; source: "event.icon";
1118 signal: "mouse,clicked,1"; source: "event.icon";
1119 action: SIGNAL_EMIT "efl,action,menu" "efl"; 939 action: SIGNAL_EMIT "efl,action,menu" "efl";
1120 } 940 }
1121 } 941 }
1122} 942}
1123 943
1124group { "efl/border/dialog"; 944group { name: "efl/border/dialog";
1125 inherit: "efl/border"; 945 inherit: "efl/border";
1126 data.item: "version" "123";
1127 parts { 946 parts {
1128 text { "efl.text.title"; 947 text { "efl.text.title";
1129 clip: "top_clip"; 948 clip: "top_clip";
@@ -1176,12 +995,12 @@ group { "efl/border/dialog";
1176 visible: 0; 995 visible: 0;
1177 } 996 }
1178 } 997 }
1179 rect { "event.maximize"; 998 rect { "efl.event.maximize";
1180 desc { "default"; 999 desc { "default";
1181 visible: 0; 1000 visible: 0;
1182 } 1001 }
1183 } 1002 }
1184 rect { "event.minimize"; 1003 rect { "efl.event.minimize";
1185 desc { "default"; 1004 desc { "default";
1186 visible: 0; 1005 visible: 0;
1187 } 1006 }
@@ -1189,28 +1008,24 @@ group { "efl/border/dialog";
1189 } 1008 }
1190} 1009}
1191 1010
1192group { "efl/border/naviframe"; 1011group { name: "efl/border/naviframe";
1193 inherit: "efl/border"; 1012 inherit: "efl/border/dialog";
1194 data.item: "version" "123";
1195 images.image: "sym_left_dark_normal.png" COMP;
1196 images.image: "sym_left_glow_normal.png" COMP;
1197 images.image: "sym_left_light_normal.png" COMP;
1198 parts { 1013 parts {
1199 image { "close1"; 1014 image { "close1";
1200 desc { "default"; 1015 desc { "default";
1201 image.normal: "sym_left_dark_normal.png"; 1016 image.normal: "i-arrow-l";
1202 } 1017 }
1203 desc { "selected"; 1018 desc { "selected";
1204 image.normal: "sym_left_glow_normal.png"; 1019 image.normal: "i-arrow-l";
1205 } 1020 }
1206 } 1021 }
1207 image { "close2"; nomouse; 1022 image { "close2"; nomouse;
1208 clip: "clip2"; 1023 clip: "clip2";
1209 desc { "default"; 1024 desc { "default";
1210 image.normal: "sym_left_light_normal.png"; 1025 image.normal: "i-arrow-l";
1211 } 1026 }
1212 desc { "selected"; 1027 desc { "selected";
1213 image.normal: "sym_left_glow_normal.png"; 1028 image.normal: "i-arrow-l";
1214 } 1029 }
1215 } 1030 }
1216 } 1031 }
@@ -1221,3 +1036,4 @@ group { "efl/border/naviframe";
1221#undef MAXIMIZED 1036#undef MAXIMIZED
1222#undef SET_MODE 1037#undef SET_MODE
1223#undef UNSET_MODE 1038#undef UNSET_MODE
1039
diff --git a/data/elementary/themes/edc/elm/bg.edc b/data/elementary/themes/edc/elm/bg.edc
index b9c7f99956..092502d599 100644
--- a/data/elementary/themes/edc/elm/bg.edc
+++ b/data/elementary/themes/edc/elm/bg.edc
@@ -15,7 +15,6 @@ group { name: "elm/bg/base/default";
15 } 15 }
16 part { name: "base"; type: RECT; 16 part { name: "base"; type: RECT;
17 description { state: "default" 0.0; 17 description { state: "default" 0.0;
18 color_class: "dialog_base";
19 color: 64 64 64 255; 18 color: 64 64 64 255;
20 } 19 }
21 } 20 }
diff --git a/data/elementary/themes/edc/elm/border.edc b/data/elementary/themes/edc/elm/border.edc
index e5641b577a..e9977d018c 100644
--- a/data/elementary/themes/edc/elm/border.edc
+++ b/data/elementary/themes/edc/elm/border.edc
@@ -107,6 +107,7 @@ group { name: "elm/border/base/default";
107 desc { "default"; 107 desc { "default";
108 color: 64 64 64 255; 108 color: 64 64 64 255;
109 visible: 0; 109 visible: 0;
110 rel.to: "elm.spacer.content";
110 } 111 }
111 desc { "visible"; 112 desc { "visible";
112 inherit: "default"; 113 inherit: "default";
@@ -117,6 +118,9 @@ group { name: "elm/border/base/default";
117 swallow { "elm.swallow.background"; 118 swallow { "elm.swallow.background";
118 required; // @since 1.19 119 required; // @since 1.19
119 clip: "client_clip"; 120 clip: "client_clip";
121 desc { "default";
122 rel.to: "elm.spacer.content";
123 }
120 } 124 }
121 spacer { "indicator_spacer"; 125 spacer { "indicator_spacer";
122 desc { "default"; 126 desc { "default";
diff --git a/data/elementary/themes/edc/elm/calendar.edc b/data/elementary/themes/edc/elm/calendar.edc
index 0d460ea614..9a9a4901a4 100644
--- a/data/elementary/themes/edc/elm/calendar.edc
+++ b/data/elementary/themes/edc/elm/calendar.edc
@@ -1,21 +1,21 @@
1#define CIT_STYLES\ 1#define CIT_STYLES\
2 style { name: "calendar_date_style";\ 2 style { name: "calendar_date_style";\
3 base: "font="FN" font_size=10 color=#ffffff style=shadow,bottom shadow_color=#00000080 align=center text_class=calendar_day_text color_class=calendar_day_text";\ 3 base: "font="FN" font_size=10 color=#a0a0a0 align=center text_class=calendar_day_text";\
4 }\ 4 }\
5 style { name: "calendar_date_holiday_style";\ 5 style { name: "calendar_date_holiday_style";\
6 base: "font="FN" font_size=10 color=#808080 style=shadow,bottom shadow_color=#00000080 align=center text_class=calendar_day_text_holiday color_class=calendar_day_text_holiday";\ 6 base: "font="FN" font_size=10 color=#3399ff align=center text_class=calendar_day_text_holiday";\
7 }\ 7 }\
8 style { name: "calendar_date_today_style";\ 8 style { name: "calendar_date_today_style";\
9 base: "font="FN" font_size=10 color=#3399ff style=glow glow_color=#3399ff18 align=center text_class=calendar_day_text_today color_class=calendar_day_text_today";\ 9 base: "font="FN" font_size=10 color=#ffffff align=center text_class=calendar_day_text_today";\
10 }\ 10 }\
11 style { name: "calendar_date_disabled_style";\ 11 style { name: "calendar_date_disabled_style";\
12 base: "font="FN" font_size=10 color=#151515 style=shadow,bottom shadow_color=#ffffffc0 align=center text_class=calendar_day_text_disabled text_class=calendar_day_text_disabled";\ 12 base: "font="FN" font_size=10 color=#282828 align=center text_class=calendar_day_text_disabled";\
13 }\ 13 }\
14 style { name: "calendar_date_weekend1_style";\ 14 style { name: "calendar_date_weekend1_style";\
15 base: "font="FN" font_size=10 color=#2020C0 style=shadow,bottom shadow_color=#ffffffc0 align=center text_class=calendar_day_text_weekend1 color_class=calendar_day_text_weekend1";\ 15 base: "font="FN" font_size=10 color=#3399ff align=center text_class=calendar_day_text_weekend1";\
16 }\ 16 }\
17 style { name: "calendar_date_weekend2_style";\ 17 style { name: "calendar_date_weekend2_style";\
18 base: "font="FN" font_size=10 color=#C02020 style=shadow,bottom shadow_color=#ffffffc0 align=center text_class=calendar_day_text_weekend2 color_class=calendar_day_text_weekend2";\ 18 base: "font="FN" font_size=10 color=#3399ff align=center text_class=calendar_day_text_weekend2";\
19 }\ 19 }\
20 20
21#define CAL_SPIN(_sufix, _text, _relative)\ 21#define CAL_SPIN(_sufix, _text, _relative)\
@@ -30,8 +30,8 @@
30 offset: 0 -1;\ 30 offset: 0 -1;\
31 }\ 31 }\
32 align: 0.0 0.5;\ 32 align: 0.0 0.5;\
33 min: 15 15;\ 33 min: 25 25;\
34 max: 15 15;\ 34 max: 25 25;\
35 }\ 35 }\
36 }\ 36 }\
37 part { name: "right_bt"#_sufix; type: RECT;\ 37 part { name: "right_bt"#_sufix; type: RECT;\
@@ -45,138 +45,110 @@
45 offset: -1 -1;\ 45 offset: -1 -1;\
46 }\ 46 }\
47 align: 1.0 0.5;\ 47 align: 1.0 0.5;\
48 min: 15 15;\ 48 min: 25 25;\
49 max: 15 15;\ 49 max: 25 25;\
50 color: 0 0 0 0;\ 50 color: 0 0 0 0;\
51 }\ 51 }\
52 }\ 52 }\
53 part { name: "elm,calendar,button"#_sufix",left";\ 53 part { name: "elm,calendar,button"#_sufix",left"; type: SWALLOW;\
54 type: SWALLOW;\
55 scale: 1;\ 54 scale: 1;\
56 description { state: "default" 0.0;\ 55 description { state: "default" 0.0;\
57 fixed: 1 1;\ 56 fixed: 1 1;\
58 rel1.to: "left_bt"#_sufix;\ 57 rel.to: "left_bt"#_sufix;\
59 rel2.to: "left_bt"#_sufix;\ 58 min: 15 15;\
59 max: 15 15;\
60 }\ 60 }\
61 description { state: "rtl" 0.0;\ 61 description { state: "rtl" 0.0;\
62 inherit: "default" 0.0;\ 62 inherit: "default" 0.0;\
63 rel1.to: "right_bt"#_sufix;\ 63 rel.to: "right_bt"#_sufix;\
64 rel2.to: "right_bt"#_sufix;\
65 }\ 64 }\
66 }\ 65 }\
67 part { name: "elm,calendar,button"#_sufix",right";\ 66 part { name: "elm,calendar,button"#_sufix",right"; type: SWALLOW;\
68 type: SWALLOW;\
69 scale: 1;\ 67 scale: 1;\
70 description { state: "default" 0.0;\ 68 description { state: "default" 0.0;\
71 fixed: 1 1;\ 69 fixed: 1 1;\
72 rel1.to: "right_bt"#_sufix;\ 70 rel.to: "right_bt"#_sufix;\
73 rel2.to: "right_bt"#_sufix;\ 71 min: 15 15;\
72 max: 15 15;\
74 }\ 73 }\
75 description { state: "rtl" 0.0;\ 74 description { state: "rtl" 0.0;\
76 inherit: "default" 0.0;\ 75 inherit: "default" 0.0;\
77 rel1.to: "left_bt"#_sufix;\ 76 rel.to: "left_bt"#_sufix;\
78 rel2.to: "left_bt"#_sufix;\
79 }\ 77 }\
80 }\ 78 }\
81 part { name: #_text; type: TEXT; mouse_events: 0;\ 79 part { name: #_text; type: TEXT; mouse_events: 0;\
82 effect: SHADOW BOTTOM; \
83 scale: 1;\ 80 scale: 1;\
84 description { state: "default" 0.0;\ 81 description { state: "default" 0.0;\
85 fixed: 1 1;\ 82 fixed: 1 1;\
86 rel1 { relative: 1.0 0.0;\ 83 rel1 { relative: 1.0 0.0;\
87 to: "left_bt"#_sufix;\ 84 to: "left_bt"#_sufix;\
85 offset: 8 8;\
88 }\ 86 }\
89 rel2 { relative: 0.0 1.0;\ 87 rel2 { relative: 0.0 1.0;\
90 to: "right_bt"#_sufix;\ 88 to: "right_bt"#_sufix;\
89 offset: -9 -9;\
91 }\ 90 }\
91 offscale;\
92 text { font: FNBD; size: 10;\ 92 text { font: FNBD; size: 10;\
93 min: 0 1;\ 93 min: 0 1;\
94 text_class: "calendar_"#_text; \ 94 text_class: "calendar_"#_text; \
95 }\ 95 }\
96 color_class: "calendar_"#_text; \ 96 color: 160 160 160 255; \
97 }\ 97 }\
98 } 98 }
99 99
100#define CH(_pos) \ 100#define CH(_pos) \
101 part { name: "ch_"#_pos"_base"; type: SPACER; \ 101 part { name: "ch_"#_pos"_base"; type: SPACER; \
102 description { state: "default" 0.0; \ 102 description { state: "default" 0.0; \
103 rel1 { \ 103 rel.to: "header";\
104 relative: (_pos % 7 / 7) 0.0; \ 104 rel1.relative: (_pos % 7 / 7) 0.0; \
105 to: "header"; \ 105 rel2.relative: (_pos % 7 / 7 + 1 / 7) 1.0; \
106 } \
107 rel2 { \
108 relative: (_pos % 7 / 7 + 1 / 7) 1.0; \
109 to: "header"; \
110 } \
111 } \ 106 } \
112 } \ 107 } \
113 part { name: "elm.ch_"#_pos".text"; type: TEXT; mouse_events: 0; \ 108 part { name: "elm.ch_"#_pos".text"; type: TEXT; mouse_events: 0; \
114 effect: SHADOW BOTTOM; \
115 scale: 1; \ 109 scale: 1; \
116 clip_to: "ch_"#_pos"_clipper"; \ 110 clip_to: "ch_"#_pos"_clipper"; \
117 description { state: "default" 0.0; \ 111 description { state: "default" 0.0; \
118 rel1.to: "ch_"#_pos"_base"; \ 112 rel.to: "ch_"#_pos"_base"; \
119 rel2.to: "ch_"#_pos"_base"; \ 113 rel1.offset: 0 3; \
114 rel2.offset: -1 -4; \
115 offscale;\
120 text { font: FN; size: 8; \ 116 text { font: FN; size: 8; \
121 min: 1 1; \ 117 min: 1 1; \
122 ellipsis: -1; \ 118 ellipsis: -1; \
123 text_class: "calendar_weekday_text"; \ 119 text_class: "calendar_weekday_text"; \
124 } \ 120 } \
125 color_class: "calendar_weekday_text"; \ 121 color: 160 160 160 255; \
126 } \ 122 } \
127 } \ 123 } \
128 part { name: "ch_"#_pos"_clipper"; type: RECT; \ 124 part { name: "ch_"#_pos"_clipper"; type: RECT; \
129 description { state: "default" 0.0; \ 125 description { state: "default" 0.0; \
130 rel1.to: "ch_"#_pos"_base"; \ 126 rel.to: "ch_"#_pos"_base"; \
131 rel2.to: "ch_"#_pos"_base"; \
132 } \ 127 } \
133 } 128 }
134 129
135#define CIT(_pos) \ 130#define CIT(_pos) \
136 part { name: "cit_"#_pos"_rect"; type: SPACER; \ 131 part { name: "cit_"#_pos"_rect"; type: SPACER; \
137 description { state: "default" 0.0; \ 132 description { state: "default" 0.0; \
138 rel1 { \ 133 rel.to: "base"; \
139 relative: (_pos % 7 / 7) \ 134 rel1.relative: (_pos % 7 / 7) (_pos / 7 / 6 - _pos % 7 / 7 / 6); \
140 (_pos / 7 / 6 - _pos % 7 / 7 / 6); \ 135 rel2.relative: (_pos % 7 / 7 + 1 / 7) (_pos / 7 / 6 + 1 / 6 - _pos % 7 / 7 / 6); \
141 to: "base"; \
142 } \
143 rel2 { \
144 relative: (_pos % 7 / 7 + 1 / 7) \
145 (_pos / 7 / 6 + 1 / 6 - _pos % 7 / 7 / 6); \
146 to: "base"; \
147 } \
148 } \ 136 } \
149 } \ 137 } \
150 part { name: "cit_"#_pos"_event"; type: RECT; repeat_events: 1; \ 138 part { name: "cit_"#_pos"_event"; type: RECT; repeat_events: 1; \
151 description { state: "default" 0.0; \ 139 description { state: "default" 0.0; \
152 rel1.to: "cit_"#_pos"_rect"; \ 140 rel.to: "cit_"#_pos"_rect"; \
153 rel2.to: "cit_"#_pos"_rect"; \
154 color: 0 0 0 0; \ 141 color: 0 0 0 0; \
155 } \ 142 } \
156 } \ 143 description { state: "today" 0.0; \
157 part { name: "cit_"#_pos"_pat"; mouse_events: 0; \
158 description { state: "default" 0.0; \
159 rel1.to: "cit_"#_pos"_selected"; \
160 rel1.offset: 1 1; \
161 rel2.to: "cit_"#_pos"_selected"; \
162 rel2.offset: -2 -2; \
163 image.normal: "diagonal_stripes.png"; \
164 color: 51 153 255 25; \
165 TILED_PATTERN(240, 240) \
166 visible: 0; \
167 } \
168 description { state: "selected" 0.0; \
169 inherit: "default" 0.0; \ 144 inherit: "default" 0.0; \
170 visible: 1; \ 145 color: 0 0 0 64; \
171 } \ 146 } \
172 } \ 147 } \
173 part { name: "cit_"#_pos"_selected"; mouse_events: 0; \ 148 part { name: "cit_"#_pos"_selected"; type: RECT; mouse_events: 0; \
174 description { state: "default" 0.0; \ 149 description { state: "default" 0.0; \
175 rel1.to: "cit_"#_pos"_rect"; \ 150 rel.to: "cit_"#_pos"_rect"; \
176 rel2.to: "cit_"#_pos"_rect"; \ 151 color: 51 153 255 128; \
177 image.normal: "outline.png"; \
178 image.border: 4 4 4 4; \
179 color: 51 153 255 255; \
180 visible: 0; \ 152 visible: 0; \
181 } \ 153 } \
182 description { state: "selected" 0.0; \ 154 description { state: "selected" 0.0; \
@@ -184,31 +156,13 @@
184 visible: 1; \ 156 visible: 1; \
185 } \ 157 } \
186 } \ 158 } \
187 part { name: "cit_"#_pos"_selected2"; mouse_events: 0; \ 159 part { name: "cit_"#_pos"_focus"; type: RECT; mouse_events: 0; \
188 description { state: "default" 0.0; \ 160 description { state: "default" 0.0; \
189 rel1.to: "cit_"#_pos"_rect"; \ 161 rel.to: "cit_"#_pos"_rect"; \
190 rel2.to: "cit_"#_pos"_rect"; \ 162 color: 255 153 51 128; \
191 image.normal: "outline.png"; \
192 image.border: 4 4 4 4; \
193 color: 51 153 255 255; \
194 visible: 0; \ 163 visible: 0; \
195 } \ 164 } \
196 description { state: "highlighted" 0.0; \ 165 description { state: "selected" 0.0; \
197 inherit: "default" 0.0; \
198 visible: 1; \
199 } \
200 } \
201 part { name: "cit_"#_pos"_glow"; mouse_events: 0; \
202 description { state: "default" 0.0; \
203 rel1.to: "cit_"#_pos"_rect"; \
204 rel2.to: "cit_"#_pos"_rect"; \
205 image.normal: "box_glow.png"; \
206 image.border: 12 12 12 12; \
207 image.middle: 0; \
208 fill.smooth: 0; \
209 visible: 0; \
210 } \
211 description { state: "focused" 0.0; \
212 inherit: "default" 0.0; \ 166 inherit: "default" 0.0; \
213 visible: 1; \ 167 visible: 1; \
214 } \ 168 } \
@@ -216,11 +170,13 @@
216 part { name: "elm.cit_"#_pos".text"; type: TEXTBLOCK; mouse_events: 0; \ 170 part { name: "elm.cit_"#_pos".text"; type: TEXTBLOCK; mouse_events: 0; \
217 scale: 1; \ 171 scale: 1; \
218 description { state: "default" 0.0; \ 172 description { state: "default" 0.0; \
219 rel1.to: "cit_"#_pos"_rect"; \ 173 rel.to: "cit_"#_pos"_rect"; \
220 rel2.to: "cit_"#_pos"_rect"; \ 174 rel1.offset: 3 0; \
175 rel2.offset: -4 -1; \
221 text.style: "calendar_date_style"; \ 176 text.style: "calendar_date_style"; \
222 text.min: 1 1; \ 177 text.min: 1 1; \
223 text.ellipsis: -1; \ 178 text.ellipsis: -1; \
179 offscale; \
224 } \ 180 } \
225 description { state: "holiday" 0.0; \ 181 description { state: "holiday" 0.0; \
226 inherit: "default" 0.0; \ 182 inherit: "default" 0.0; \
@@ -247,20 +203,13 @@
247 scale: 1; \ 203 scale: 1; \
248 description { state: "default" 0.0; \ 204 description { state: "default" 0.0; \
249 fixed: 1 1; \ 205 fixed: 1 1; \
250 rel1 { \ 206 rel.to: "cit_"#_pos"_rect"; \
251 to: "cit_"#_pos"_rect"; \ 207 rel1.relative: 0.6 0.5; \
252 relative: 0.6 0.5; \ 208 min: 15 15; \
253 } \ 209 max: 15 15; \
254 rel2 { \
255 to: "cit_"#_pos"_rect"; \
256 relative: 0.6 0.5; \
257 } \
258 min: 16 16; \
259 max: 16 16; \
260 aspect: 1 1; \
261 align: 0.0 1.0;\ 210 align: 0.0 1.0;\
262 image.normal: "icon_border_remember.png"; \ 211 image.normal: "i-check"; \
263 color_class: "calendar_day_checked"; \ 212 color: 53 153 255 255; \
264 visible: 0; \ 213 visible: 0; \
265 } \ 214 } \
266 description { state: "visible" 0.0; \ 215 description { state: "visible" 0.0; \
@@ -270,8 +219,7 @@
270 } \ 219 } \
271 part { name: "elm.cit_"#_pos".access"; type: RECT; repeat_events: 1; \ 220 part { name: "elm.cit_"#_pos".access"; type: RECT; repeat_events: 1; \
272 description { state: "default" 0.0; \ 221 description { state: "default" 0.0; \
273 rel1.to: "cit_"#_pos"_event"; \ 222 rel.to: "cit_"#_pos"_event"; \
274 rel2.to: "cit_"#_pos"_event"; \
275 color: 0 0 0 0; \ 223 color: 0 0 0 0; \
276 } \ 224 } \
277 } \ 225 } \
@@ -281,7 +229,6 @@
281 signal: "cit_"#_pos",selected"; \ 229 signal: "cit_"#_pos",selected"; \
282 source: "elm"; \ 230 source: "elm"; \
283 action: STATE_SET "selected" 0.0; \ 231 action: STATE_SET "selected" 0.0; \
284 target: "cit_"#_pos"_pat"; \
285 target: "cit_"#_pos"_selected"; \ 232 target: "cit_"#_pos"_selected"; \
286 } \ 233 } \
287 program { \ 234 program { \
@@ -289,7 +236,6 @@
289 signal: "cit_"#_pos",unselected"; \ 236 signal: "cit_"#_pos",unselected"; \
290 source: "elm"; \ 237 source: "elm"; \
291 action: STATE_SET "default" 0.0; \ 238 action: STATE_SET "default" 0.0; \
292 target: "cit_"#_pos"_pat"; \
293 target: "cit_"#_pos"_selected"; \ 239 target: "cit_"#_pos"_selected"; \
294 } \ 240 } \
295 program { \ 241 program { \
@@ -300,7 +246,7 @@
300 set_int(item_focus_enabled, 1); \ 246 set_int(item_focus_enabled, 1); \
301 set_int(last_focused_item, _pos); \ 247 set_int(last_focused_item, _pos); \
302 if (get_int(win_focus_enabled) == 1) \ 248 if (get_int(win_focus_enabled) == 1) \
303 set_state(PART:"cit_"#_pos"_glow", "focused", 0.0); \ 249 set_state(PART:"cit_"#_pos"_focus", "selected", 0.0); \
304 } \ 250 } \
305 } \ 251 } \
306 program { \ 252 program { \
@@ -309,7 +255,7 @@
309 source: "elm"; \ 255 source: "elm"; \
310 script { \ 256 script { \
311 set_int(item_focus_enabled, 0); \ 257 set_int(item_focus_enabled, 0); \
312 set_state(PART:"cit_"#_pos"_glow", "default", 0.0); \ 258 set_state(PART:"cit_"#_pos"_focus", "default", 0.0); \
313 } \ 259 } \
314 } \ 260 } \
315 program { \ 261 program { \
@@ -318,6 +264,7 @@
318 source: "elm"; \ 264 source: "elm"; \
319 action: STATE_SET "today" 0.0; \ 265 action: STATE_SET "today" 0.0; \
320 target: "elm.cit_"#_pos".text"; \ 266 target: "elm.cit_"#_pos".text"; \
267 target: "cit_"#_pos"_event";\
321 } \ 268 } \
322 program { \ 269 program { \
323 name: "cit_"#_pos"_not_today"; \ 270 name: "cit_"#_pos"_not_today"; \
@@ -325,6 +272,7 @@
325 source: "elm"; \ 272 source: "elm"; \
326 action: STATE_SET "default" 0.0; \ 273 action: STATE_SET "default" 0.0; \
327 target: "elm.cit_"#_pos".text"; \ 274 target: "elm.cit_"#_pos".text"; \
275 target: "cit_"#_pos"_event";\
328 } \ 276 } \
329 program { \ 277 program { \
330 name: "cit_"#_pos"_enable"; \ 278 name: "cit_"#_pos"_enable"; \
@@ -349,15 +297,15 @@
349 source: "cit_"#_pos"_clicked"; \ 297 source: "cit_"#_pos"_clicked"; \
350 signal: "mouse,down,1"; \ 298 signal: "mouse,down,1"; \
351 source: "cit_"#_pos"_event"; \ 299 source: "cit_"#_pos"_event"; \
352 action: STATE_SET "highlighted" 0.0; \ 300 action: STATE_SET "selected" 0.0; \
353 target: "cit_"#_pos"_selected2"; \ 301 target: "cit_"#_pos"_selected"; \
354 } \ 302 } \
355 program { \ 303 program { \
356 source: "cit_"#_pos"_clicked"; \ 304 source: "cit_"#_pos"_clicked"; \
357 signal: "mouse,up,1"; \ 305 signal: "mouse,up,1"; \
358 source: "cit_"#_pos"_event"; \ 306 source: "cit_"#_pos"_event"; \
359 action: STATE_SET "default" 0.0; \ 307 action: STATE_SET "default" 0.0; \
360 target: "cit_"#_pos"_selected2"; \ 308 target: "cit_"#_pos"_selected"; \
361 } \ 309 } \
362 program { \ 310 program { \
363 source: "cit_"#_pos"_clicked"; \ 311 source: "cit_"#_pos"_clicked"; \
@@ -440,14 +388,6 @@
440 } 388 }
441 389
442group { name: "elm/calendar/base/default"; 390group { name: "elm/calendar/base/default";
443 images.image: "sym_left_light_normal.png" COMP;
444 images.image: "sym_right_light_normal.png" COMP;
445 images.image: "sym_left_glow_normal.png" COMP;
446 images.image: "sym_right_glow_normal.png" COMP;
447 images.image: "icon_border_remember.png" COMP;
448 images.image: "outline.png" COMP;
449 images.image: "box_glow.png" COMP;
450 images.image: "diagonal_stripes.png" COMP;
451 data.item: "focus_highlight" "on"; 391 data.item: "focus_highlight" "on";
452 script { 392 script {
453 public rtl; 393 public rtl;
@@ -460,28 +400,30 @@ group { name: "elm/calendar/base/default";
460 } 400 }
461 parts { 401 parts {
462 part { name: "bg"; type: SPACER; 402 part { name: "bg"; type: SPACER;
403 scale: 1;
463 description { state: "default" 0.0; 404 description { state: "default" 0.0;
464 rel1.offset: 1 1; 405 rel1.offset: 8 8;
465 rel2.offset: -2 -2; 406 rel2.offset: -9 -9;
407 offscale;
466 } 408 }
467 } 409 }
468 part { name: "elm.swallow.background"; type: SWALLOW; 410 part { name: "elm.swallow.background"; type: SWALLOW;
469 description { state: "default" 0.0; 411 description { state: "default" 0.0;
470 rel1.to: "bg"; 412 rel.to: "bg";
471 rel2.to: "bg";
472 } 413 }
473 } 414 }
474 part { name: "spinner-base1"; type: SPACER; 415 part { name: "spinner-base1"; type: SPACER;
416 scale: 1;
475 description { state: "default" 0.0; 417 description { state: "default" 0.0;
476 min: 24 16; 418 min: 24 16;
477 max: 999999 16; 419 max: 999999 16;
478 rel1.to: "bg"; 420 rel.to: "bg";
479 rel2.to: "bg";
480 rel2.relative: 1.0 (1/8); 421 rel2.relative: 1.0 (1/8);
481 align: 0.5 0.0; 422 align: 0.5 0.0;
482 } 423 }
483 } 424 }
484 part { name: "table-base"; type: SPACER; 425 part { name: "table-base"; type: SPACER;
426 scale: 1;
485 description { state: "default" 0.0; 427 description { state: "default" 0.0;
486 min: 70 60; 428 min: 70 60;
487 rel1.to_x: "bg"; 429 rel1.to_x: "bg";
@@ -490,29 +432,31 @@ group { name: "elm/calendar/base/default";
490 rel1.relative: 0.0 1.0; 432 rel1.relative: 0.0 1.0;
491 rel2.to: "bg"; 433 rel2.to: "bg";
492 rel2.offset: -4 -4; 434 rel2.offset: -4 -4;
435 offscale;
493 } 436 }
494 } 437 }
495 part { name: "header"; type: SPACER; 438 part { name: "header"; type: SPACER;
496 description { state: "default" 0.0; 439 description { state: "default" 0.0;
497 rel1.to: "table-base"; 440 rel.to: "table-base";
498 rel2.to: "table-base";
499 rel2.relative: 1.0 (1/7); 441 rel2.relative: 1.0 (1/7);
500 align: 0.5 0.0; 442 align: 0.5 0.0;
501 min: 0 16; 443 min: 0 25;
502 } 444 }
503 } 445 }
504 part { name: "header_separator"; mouse_events: 0; 446 part { name: "header_separator"; type: RECT; mouse_events: 0;
447 scale: 1;
505 description { state: "default" 0.0; 448 description { state: "default" 0.0;
506 fixed: 1 1; 449 fixed: 1 1;
507 rel1.to: "header"; 450 rel.to: "header";
508 rel1.relative: 0.0 1.0; 451 rel1.relative: 0.0 1.0;
509 rel1.offset: 0 -2; 452 rel1.offset: 8 -1;
510 rel2.to: "header"; 453 rel2.offset: -9 -1;
511 image.normal: "separator_horiz.png"; 454 color: 80 80 80 255;
512 fill.smooth: 0; 455 offscale;
513 } 456 }
514 } 457 }
515 part { name: "base"; type: SPACER; 458 part { name: "base"; type: SPACER;
459 scale: 1;
516 description { state: "default" 0.0; 460 description { state: "default" 0.0;
517 rel1.to_x: "table-base"; 461 rel1.to_x: "table-base";
518 rel1.to_y: "header"; 462 rel1.to_y: "header";
@@ -520,6 +464,7 @@ group { name: "elm/calendar/base/default";
520 rel1.offset: 3 0; 464 rel1.offset: 3 0;
521 rel2.to: "table-base"; 465 rel2.to: "table-base";
522 rel2.offset: -3 0; 466 rel2.offset: -3 0;
467 offscale;
523 } 468 }
524 } 469 }
525 470
@@ -560,18 +505,20 @@ group { name: "elm/calendar/base/double_spinners";
560 inherit: "elm/calendar/base/default"; 505 inherit: "elm/calendar/base/default";
561 parts { 506 parts {
562 part { name: "spinner-base1"; type: SPACER; 507 part { name: "spinner-base1"; type: SPACER;
508 scale: 1;
563 description { state: "default" 0.0; 509 description { state: "default" 0.0;
564 min: 24 24; 510 min: 24 24;
565 max: 999999 24; 511 max: 999999 24;
566 rel1.to: "bg"; 512 rel.to: "bg";
567 rel1.offset: 6 6; 513 rel1.offset: 6 6;
568 rel2.to: "bg";
569 rel2.relative: 0.5 1.0; 514 rel2.relative: 0.5 1.0;
570 rel2.offset: -7 -7; 515 rel2.offset: -7 -7;
571 align: 0.0 0.0; 516 align: 0.0 0.0;
517 offscale;
572 } 518 }
573 } 519 }
574 part { name: "spinner-base2"; type: SPACER; 520 part { name: "spinner-base2"; type: SPACER;
521 scale: 1;
575 description { state: "default" 0.0; 522 description { state: "default" 0.0;
576 min: 24 24; 523 min: 24 24;
577 max: 999999 24; 524 max: 999999 24;
@@ -582,6 +529,7 @@ group { name: "elm/calendar/base/double_spinners";
582 rel2.to: "bg"; 529 rel2.to: "bg";
583 rel2.offset: -7 -7; 530 rel2.offset: -7 -7;
584 align: 0.0 0.0; 531 align: 0.0 0.0;
532 offscale;
585 } 533 }
586 } 534 }
587 CAL_SPIN(,month_text, spinner-base1) 535 CAL_SPIN(,month_text, spinner-base1)
diff --git a/data/elementary/themes/edc/elm/check.edc b/data/elementary/themes/edc/elm/check.edc
index 58e698217e..11226d2195 100644
--- a/data/elementary/themes/edc/elm/check.edc
+++ b/data/elementary/themes/edc/elm/check.edc
@@ -1,4 +1,12 @@
1group { name: "elm/check/base/default"; 1group { name: "elm/check/base/default";
2 sounds {
3 sample { name: "wood-tap1" LOSSY 64;
4 source: "wood-tap.wav";
5 }
6 sample { name: "wood-tap2" LOSSY 64;
7 source: "wood-tap2.wav";
8 }
9 }
2 script { 10 script {
3 BUTTONMODE_SCRIPT 11 BUTTONMODE_SCRIPT
4 } 12 }
@@ -214,6 +222,15 @@ group { name: "elm/check/base/default";
214 program { signal: "mouse,clicked,1"; source: "event"; 222 program { signal: "mouse,clicked,1"; source: "event";
215 action: SIGNAL_EMIT "elm,action,check,toggle" "elm"; 223 action: SIGNAL_EMIT "elm,action,check,toggle" "elm";
216 } 224 }
225 program { signal: "mouse,down,1"; source: "event";
226 script {
227 new buf[32]; new Float:val;
228 get_state(PART:"ck_check", buf, 32, val);
229 if (!strcmp(buf, "default")) { run_program(PROGRAM:"snd-check-on"); }
230 else { run_program(PROGRAM:"snd-check-off"); }
231 echo(buf);
232 }
233 }
217 program { signal: "elm,state,check,on"; source: "elm"; 234 program { signal: "elm,state,check,on"; source: "elm";
218 action: STATE_SET "selected" 0.0; 235 action: STATE_SET "selected" 0.0;
219 target: "ck_check"; 236 target: "ck_check";
@@ -222,6 +239,12 @@ group { name: "elm/check/base/default";
222 action: STATE_SET "default" 0.0; 239 action: STATE_SET "default" 0.0;
223 target: "ck_check"; 240 target: "ck_check";
224 } 241 }
242 program { name: "snd-check-on";
243 action: PLAY_SAMPLE "wood-tap1" 1.0 INPUT;
244 }
245 program { name: "snd-check-off";
246 action: PLAY_SAMPLE "wood-tap2" 1.0 INPUT;
247 }
225 program { signal: "mouse,down,1"; source: "event"; 248 program { signal: "mouse,down,1"; source: "event";
226 action: SIGNAL_EMIT "elm,action,press" "elm"; 249 action: SIGNAL_EMIT "elm,action,press" "elm";
227 after: "button_click_anim"; 250 after: "button_click_anim";
diff --git a/data/elementary/themes/edc/elm/code.edc b/data/elementary/themes/edc/elm/code.edc
index c55e592c21..27b92e3fde 100644
--- a/data/elementary/themes/edc/elm/code.edc
+++ b/data/elementary/themes/edc/elm/code.edc
@@ -10,19 +10,14 @@ group { name: "elm/code/layout/default";
10 description { state: "default" 0.0; 10 description { state: "default" 0.0;
11 align: 0.5 0.0; 11 align: 0.5 0.0;
12 fixed: 0 1; 12 fixed: 0 1;
13
14 rel2 {
15 relative: 1.0 1.0;
16 offset: 0 0;
17 }
18 } 13 }
19 } 14 }
20 } 15 }
21} 16}
22 17
23color_classes { 18color_classes {
24 color_class { name: "elm/code/status/default"; color: 36 36 36 255; } 19 color_class { name: "elm/code/status/default"; color: 48 48 48 255; }
25 color_class { name: "elm/code/status/current"; color: 12 12 12 255; } 20 color_class { name: "elm/code/status/current"; color: 32 32 32 255; }
26 color_class { name: "elm/code/status/ignored"; color: 36 36 36 255; } 21 color_class { name: "elm/code/status/ignored"; color: 36 36 36 255; }
27 color_class { name: "elm/code/status/note"; color: 221 119 17 255; } 22 color_class { name: "elm/code/status/note"; color: 221 119 17 255; }
28 color_class { name: "elm/code/status/warning"; color: 221 119 17 255; } 23 color_class { name: "elm/code/status/warning"; color: 221 119 17 255; }
@@ -35,8 +30,8 @@ color_classes {
35 color_class { name: "elm/code/status/failed"; color: 96 54 54 255; } 30 color_class { name: "elm/code/status/failed"; color: 96 54 54 255; }
36 color_class { name: "elm/code/status/todo"; color: 51 85 187 255; } 31 color_class { name: "elm/code/status/todo"; color: 51 85 187 255; }
37 32
38 color_class { name: "elm/code/token/default"; color: 187 187 187 255; } 33 color_class { name: "elm/code/token/default"; color: 160 160 160 255; }
39 color_class { name: "elm/code/token/comment"; color: 85 85 85 255; } 34 color_class { name: "elm/code/token/comment"; color: 255 255 255 48; }
40 color_class { name: "elm/code/token/string"; color: 255 136 119 255; } 35 color_class { name: "elm/code/token/string"; color: 255 136 119 255; }
41 color_class { name: "elm/code/token/number"; color: 170 153 34 255; } 36 color_class { name: "elm/code/token/number"; color: 170 153 34 255; }
42 color_class { name: "elm/code/token/brace"; color: 170 102 170 255; } 37 color_class { name: "elm/code/token/brace"; color: 170 102 170 255; }
@@ -52,8 +47,8 @@ color_classes {
52 color_class { name: "elm/code/token/match"; color: 187 187 51 255; } 47 color_class { name: "elm/code/token/match"; color: 187 187 51 255; }
53 48
54 color_class { name: "elm/code/widget/color/selection"; color: 51 153 255 255; } 49 color_class { name: "elm/code/widget/color/selection"; color: 51 153 255 255; }
55 color_class { name: "elm/code/widget/color/gutter/bg"; color: 75 75 75 255; } 50 color_class { name: "elm/code/widget/color/gutter/bg"; color: 64 64 64 255; }
56 color_class { name: "elm/code/widget/color/gutter/fg"; color: 139 139 139 255; } 51 color_class { name: "elm/code/widget/color/gutter/fg"; color: 128 128 128 255; }
57 color_class { name: "elm/code/widget/color/gutter/scope/bg"; color: 54 54 54 255; } 52 color_class { name: "elm/code/widget/color/gutter/scope/bg"; color: 54 54 54 255; }
58 color_class { name: "elm/code/widget/color/whitespace"; color: 50 50 50 127; } 53 color_class { name: "elm/code/widget/color/whitespace"; color: 96 96 96 255; }
59} 54}
diff --git a/data/elementary/themes/edc/elm/entry.edc b/data/elementary/themes/edc/elm/entry.edc
index 6cdb311c82..2f1bb8fb9e 100644
--- a/data/elementary/themes/edc/elm/entry.edc
+++ b/data/elementary/themes/edc/elm/entry.edc
@@ -539,7 +539,6 @@ group { name: "elm/entry/anchor/default";
539} 539}
540 540
541group { name: "elm/entry/base/default"; 541group { name: "elm/entry/base/default";
542/*
543 sounds { 542 sounds {
544 sample { name: "key-tap1" LOSSY 64; 543 sample { name: "key-tap1" LOSSY 64;
545 source: "kbd-tap.wav"; 544 source: "kbd-tap.wav";
@@ -557,7 +556,6 @@ group { name: "elm/entry/base/default";
557 source: "kbd-tap5.wav"; 556 source: "kbd-tap5.wav";
558 } 557 }
559 } 558 }
560 */
561 styles { 559 styles {
562 style { name: "entry_style"; 560 style { name: "entry_style";
563 base: "font="FN" font_size=10 color=#a0a0a0 wrap=word text_class=entry_text color_class=entry_text left_margin=2 right_margin=2"; 561 base: "font="FN" font_size=10 color=#a0a0a0 wrap=word text_class=entry_text color_class=entry_text left_margin=2 right_margin=2";
@@ -656,7 +654,6 @@ group { name: "elm/entry/base/default";
656 action: STATE_SET "default" 0.0; 654 action: STATE_SET "default" 0.0;
657 target: "elm.guide"; 655 target: "elm.guide";
658 } 656 }
659/*
660 program { name: "key-down"; 657 program { name: "key-down";
661 signal: "entry,keydown"; source: "elm.text"; 658 signal: "entry,keydown"; source: "elm.text";
662 script { 659 script {
@@ -680,7 +677,6 @@ group { name: "elm/entry/base/default";
680 program { name: "key-down5"; 677 program { name: "key-down5";
681 action: PLAY_SAMPLE "key-tap5" 1.0 INPUT; 678 action: PLAY_SAMPLE "key-tap5" 1.0 INPUT;
682 } 679 }
683 */
684 } 680 }
685} 681}
686 682
@@ -1151,7 +1147,6 @@ group { name: "elm/entry/handler/end/default";
1151} 1147}
1152 1148
1153group { name: "elm/efl_ui_text/base/default"; 1149group { name: "elm/efl_ui_text/base/default";
1154/*
1155 sounds { 1150 sounds {
1156 sample { name: "key-tap1" LOSSY 64; 1151 sample { name: "key-tap1" LOSSY 64;
1157 source: "kbd-tap.wav"; 1152 source: "kbd-tap.wav";
@@ -1169,7 +1164,6 @@ group { name: "elm/efl_ui_text/base/default";
1169 source: "kbd-tap5.wav"; 1164 source: "kbd-tap5.wav";
1170 } 1165 }
1171 } 1166 }
1172 */
1173// data.item: "context_menu_orientation" "horizontal"; 1167// data.item: "context_menu_orientation" "horizontal";
1174 parts { 1168 parts {
1175 part { name: "elm.swallow.background"; type: SWALLOW; 1169 part { name: "elm.swallow.background"; type: SWALLOW;
@@ -1231,7 +1225,6 @@ group { name: "elm/efl_ui_text/base/default";
1231 target: "elm.guide"; 1225 target: "elm.guide";
1232 } 1226 }
1233#endif 1227#endif
1234/*
1235 program { name: "key-down"; 1228 program { name: "key-down";
1236 signal: "entry,keydown"; source: "elm.text"; 1229 signal: "entry,keydown"; source: "elm.text";
1237 script { 1230 script {
@@ -1255,7 +1248,6 @@ group { name: "elm/efl_ui_text/base/default";
1255 program { name: "key-down5"; 1248 program { name: "key-down5";
1256 action: PLAY_SAMPLE "key-tap5" 1.0 INPUT; 1249 action: PLAY_SAMPLE "key-tap5" 1.0 INPUT;
1257 } 1250 }
1258 */
1259 } 1251 }
1260} 1252}
1261/////////////////////////////////////////////////////////////////////////////// 1253///////////////////////////////////////////////////////////////////////////////
diff --git a/data/elementary/themes/edc/ibar-ibox.edc b/data/elementary/themes/edc/ibar-ibox.edc
index 941223f62c..1475d16d3a 100644
--- a/data/elementary/themes/edc/ibar-ibox.edc
+++ b/data/elementary/themes/edc/ibar-ibox.edc
@@ -51,11 +51,12 @@ group { name: "e/modules/ibox/icon";
51 } 51 }
52 part { name: "e.swallow.content"; type: SWALLOW; 52 part { name: "e.swallow.content"; type: SWALLOW;
53 clip_to: "item_clip"; 53 clip_to: "item_clip";
54 scale: 1;
54 description { state: "default" 0.0; 55 description { state: "default" 0.0;
55 rel1.to: "content"; 56 rel.to: "content";
56 rel2.to: "content";
57 rel1.offset: 3 3; 57 rel1.offset: 3 3;
58 rel2.offset: -4 -4; 58 rel2.offset: -4 -4;
59 offscale;
59 } 60 }
60 description { state: "bounce1" 0.0; 61 description { state: "bounce1" 0.0;
61 inherit: "default" 0.0; 62 inherit: "default" 0.0;
@@ -91,42 +92,58 @@ group { name: "e/modules/ibox/icon";
91 } 92 }
92 } 93 }
93 part { name: "clip"; type: RECT; mouse_events: 0; 94 part { name: "clip"; type: RECT; mouse_events: 0;
95 scale: 1;
94 description { state: "default" 0.0; 96 description { state: "default" 0.0;
97 rel1.offset: (0 - SHELFPAD) (0 - SHELFPAD);
98 rel2.offset: (SHELFPAD - 1) (SHELFPAD - 1);
99 offscale;
95 } 100 }
96 } 101 }
97 part { name: "clip1"; type: RECT; mouse_events: 0; 102 part { name: "clip1"; type: RECT; mouse_events: 0;
98 clip_to: "clip"; 103 clip_to: "clip";
104 scale: 1;
99 description { state: "default" 0.0; 105 description { state: "default" 0.0;
106 rel1.offset: (0 - SHELFPAD) (0 - SHELFPAD);
107 rel2.offset: (SHELFPAD - 1) (SHELFPAD - 1);
108 offscale;
100 visible: 1; 109 visible: 1;
101 } 110 }
102 description { state: "left" 0.0; 111 description { state: "left" 0.0;
112 inherit: "default" 0.0;
103 visible: 0; 113 visible: 0;
104 } 114 }
105 description { state: "right" 0.0; 115 description { state: "right" 0.0;
116 inherit: "default" 0.0;
106 visible: 0; 117 visible: 0;
107 } 118 }
108 } 119 }
109 part { name: "clip2"; type: RECT; mouse_events: 0; 120 part { name: "clip2"; type: RECT; mouse_events: 0;
110 clip_to: "clip"; 121 clip_to: "clip";
111 description { state: "default" 0.0; 122 description { state: "default" 0.0;
123 rel.to: "clip1";
112 visible: 0; 124 visible: 0;
113 } 125 }
114 description { state: "left" 0.0; 126 description { state: "left" 0.0;
127 inherit: "default" 0.0;
115 visible: 1; 128 visible: 1;
116 } 129 }
117 description { state: "right" 0.0; 130 description { state: "right" 0.0;
131 inherit: "default" 0.0;
118 visible: 0; 132 visible: 0;
119 } 133 }
120 } 134 }
121 part { name: "clip3"; type: RECT; mouse_events: 0; 135 part { name: "clip3"; type: RECT; mouse_events: 0;
122 clip_to: "clip"; 136 clip_to: "clip";
123 description { state: "default" 0.0; 137 description { state: "default" 0.0;
138 rel.to: "clip1";
124 visible: 0; 139 visible: 0;
125 } 140 }
126 description { state: "left" 0.0; 141 description { state: "left" 0.0;
142 inherit: "default" 0.0;
127 visible: 0; 143 visible: 0;
128 } 144 }
129 description { state: "right" 0.0; 145 description { state: "right" 0.0;
146 inherit: "default" 0.0;
130 visible: 1; 147 visible: 1;
131 } 148 }
132 } 149 }
@@ -139,6 +156,9 @@ group { name: "e/modules/ibox/icon";
139 rel1.relative: 0.0 1.0; 156 rel1.relative: 0.0 1.0;
140 align: 0.5 1.0; 157 align: 0.5 1.0;
141 max: 99999 5; 158 max: 99999 5;
159 rel1.offset: 0 (SHELFPAD - 1);
160 rel2.offset: -1 (SHELFPAD - 1);
161 offscale;
142 } 162 }
143 description { state: "visible" 0.0; 163 description { state: "visible" 0.0;
144 inherit: "default" 0.0; 164 inherit: "default" 0.0;
@@ -155,6 +175,9 @@ group { name: "e/modules/ibox/icon";
155 rel2.relative: 0.0 1.0; 175 rel2.relative: 0.0 1.0;
156 align: 0.0 0.5; 176 align: 0.0 0.5;
157 max: 5 99999; 177 max: 5 99999;
178 rel1.offset: (0 - SHELFPAD) 0;
179 rel2.offset: (0 - SHELFPAD) -1;
180 offscale;
158 } 181 }
159 description { state: "visible" 0.0; 182 description { state: "visible" 0.0;
160 inherit: "default" 0.0; 183 inherit: "default" 0.0;
@@ -171,6 +194,9 @@ group { name: "e/modules/ibox/icon";
171 rel1.relative: 1.0 0.0; 194 rel1.relative: 1.0 0.0;
172 align: 1.0 0.5; 195 align: 1.0 0.5;
173 max: 5 99999; 196 max: 5 99999;
197 rel1.offset: (SHELFPAD - 1) 0;
198 rel2.offset: (SHELFPAD - 1) -1;
199 offscale;
174 } 200 }
175 description { state: "visible" 0.0; 201 description { state: "visible" 0.0;
176 inherit: "default" 0.0; 202 inherit: "default" 0.0;
@@ -185,22 +211,19 @@ group { name: "e/modules/ibox/icon";
185 } 211 }
186 } 212 }
187 programs { 213 programs {
188 program { 214 program { signal: "e,origin,center"; source: "e";
189 signal: "e,origin,center"; source: "e";
190 action: STATE_SET "default" 0.0; 215 action: STATE_SET "default" 0.0;
191 target: "clip1"; 216 target: "clip1";
192 target: "clip2"; 217 target: "clip2";
193 target: "clip3"; 218 target: "clip3";
194 } 219 }
195 program { 220 program { signal: "e,origin,left"; source: "e";
196 signal: "e,origin,left"; source: "e";
197 action: STATE_SET "left" 0.0; 221 action: STATE_SET "left" 0.0;
198 target: "clip1"; 222 target: "clip1";
199 target: "clip2"; 223 target: "clip2";
200 target: "clip3"; 224 target: "clip3";
201 } 225 }
202 program { 226 program { signal: "e,origin,right"; source: "e";
203 signal: "e,origin,right"; source: "e";
204 action: STATE_SET "right" 0.0; 227 action: STATE_SET "right" 0.0;
205 target: "clip1"; 228 target: "clip1";
206 target: "clip2"; 229 target: "clip2";
@@ -225,29 +248,25 @@ group { name: "e/modules/ibox/icon";
225// program { 248// program {
226// signal: "e,action,hide,label"; source: "e"; 249// signal: "e,action,hide,label"; source: "e";
227// } 250// }
228 program { 251 program { signal: "e,state,starting"; source: "e";
229 signal: "e,state,starting"; source: "e";
230 action: STATE_SET "starting" 0.0; 252 action: STATE_SET "starting" 0.0;
231 transition: DECELERATE 0.2; 253 transition: DECELERATE 0.2;
232 target: "content"; 254 target: "content";
233 } 255 }
234 program { 256 program { signal: "e,state,started"; source: "e";
235 signal: "e,state,started"; source: "e";
236 action: STATE_SET "default" 0.0; 257 action: STATE_SET "default" 0.0;
237 transition: ACCELERATE 0.2; 258 transition: ACCELERATE 0.2;
238 target: "content"; 259 target: "content";
239 } 260 }
240 ///////////////////////////////////////////////////////////// 261 /////////////////////////////////////////////////////////////
241 program { 262 program { signal: "e,state,on"; source: "e";
242 signal: "e,state,on"; source: "e";
243 action: STATE_SET "visible" 0.0; 263 action: STATE_SET "visible" 0.0;
244 target: "indicator1"; 264 target: "indicator1";
245 target: "indicator2"; 265 target: "indicator2";
246 target: "indicator3"; 266 target: "indicator3";
247 transition: ACCELERATE 0.2; 267 transition: ACCELERATE 0.2;
248 } 268 }
249 program { 269 program { signal: "e,state,off"; source: "e";
250 signal: "e,state,off"; source: "e";
251 action: STATE_SET "default" 0.0; 270 action: STATE_SET "default" 0.0;
252 target: "indicator1"; 271 target: "indicator1";
253 target: "indicator2"; 272 target: "indicator2";
@@ -255,8 +274,7 @@ group { name: "e/modules/ibox/icon";
255 transition: DECELERATE 0.2; 274 transition: DECELERATE 0.2;
256 } 275 }
257 ///////////////////////////////////////////////////////////// 276 /////////////////////////////////////////////////////////////
258 program { 277 program { signal: "e,state,urgent"; source: "e";
259 signal: "e,state,urgent"; source: "e";
260 action: STATE_SET "bounce1" 0.0; 278 action: STATE_SET "bounce1" 0.0;
261 target: "e.swallow.content"; 279 target: "e.swallow.content";
262 target: "e.swallow.preview"; 280 target: "e.swallow.preview";
@@ -276,8 +294,7 @@ group { name: "e/modules/ibox/icon";
276 target: "e.swallow.preview"; 294 target: "e.swallow.preview";
277 after: "urg1"; 295 after: "urg1";
278 } 296 }
279 program { 297 program { signal: "e,state,not_urgent"; source: "e";
280 signal: "e,state,not_urgent"; source: "e";
281 action: STATE_SET "default" 0.0; 298 action: STATE_SET "default" 0.0;
282 target: "e.swallow.content"; 299 target: "e.swallow.content";
283 target: "e.swallow.preview"; 300 target: "e.swallow.preview";
@@ -327,8 +344,7 @@ group { name: "e/modules/ibox/icon_overlay";
327 clip_to: "item_clip"; 344 clip_to: "item_clip";
328 description { state: "default" 0.0; 345 description { state: "default" 0.0;
329 visible: 0; 346 visible: 0;
330 rel1.to: "base"; 347 rel.to: "base";
331 rel2.to: "base";
332 color: 255 255 255 0; 348 color: 255 255 255 0;
333 } 349 }
334 description { state: "visible" 0.0; 350 description { state: "visible" 0.0;
@@ -362,8 +378,7 @@ group { name: "e/modules/ibox/icon_overlay";
362 BUSY("busy_area", "e,state,starting", "e", "e,state,started", "e") 378 BUSY("busy_area", "e,state,starting", "e", "e,state,started", "e")
363 part { name: "busy_area"; type: SPACER; 379 part { name: "busy_area"; type: SPACER;
364 description { state: "default" 0.0; 380 description { state: "default" 0.0;
365 rel1.to: "content"; 381 rel.to: "content";
366 rel2.to: "content";
367 rel1.relative: -0.5 -0.5; 382 rel1.relative: -0.5 -0.5;
368 rel2.relative: 1.5 1.5; 383 rel2.relative: 1.5 1.5;
369 } 384 }
@@ -406,9 +421,8 @@ group { name: "e/modules/ibox/icon_overlay";
406 part { name: "bg"; type: RECT; mouse_events: 0; 421 part { name: "bg"; type: RECT; mouse_events: 0;
407 description { state: "default" 0.0; 422 description { state: "default" 0.0;
408 rel1.offset: -5 -5; 423 rel1.offset: -5 -5;
409 rel1.to: "e.text.label"; 424 rel.to: "e.text.label";
410 rel2.offset: 4 4; 425 rel2.offset: 4 4;
411 rel2.to: "e.text.label";
412 fixed: 1 1; 426 fixed: 1 1;
413 color: 0 0 0 0; 427 color: 0 0 0 0;
414 visible: 0; 428 visible: 0;
@@ -451,21 +465,18 @@ group { name: "e/modules/ibox/icon_overlay";
451// program { 465// program {
452// signal: "e,action,start"; source: "e"; 466// signal: "e,action,start"; source: "e";
453// } 467// }
454 program { 468 program { signal: "e,state,starting"; source: "e";
455 signal: "e,state,starting"; source: "e";
456 action: STATE_SET "starting" 0.0; 469 action: STATE_SET "starting" 0.0;
457 transition: DECELERATE 0.2; 470 transition: DECELERATE 0.2;
458 target: "content"; 471 target: "content";
459 } 472 }
460 program { 473 program { signal: "e,state,started"; source: "e";
461 signal: "e,state,started"; source: "e";
462 action: STATE_SET "default" 0.0; 474 action: STATE_SET "default" 0.0;
463 transition: ACCELERATE 0.2; 475 transition: ACCELERATE 0.2;
464 target: "content"; 476 target: "content";
465 } 477 }
466 /////////////////////////////////////////////////////////// 478 ///////////////////////////////////////////////////////////
467 program { 479 program { signal: "load"; source: "";
468 signal: "load"; source: "";
469 script { 480 script {
470 set_int(urgent, 0); 481 set_int(urgent, 0);
471 } 482 }
@@ -497,15 +508,13 @@ group { name: "e/modules/ibox/icon_overlay";
497 } 508 }
498 after: "go_passive2"; 509 after: "go_passive2";
499 } 510 }
500 program { 511 program { signal: "e,action,show,label"; source: "e";
501 signal: "e,action,show,label"; source: "e";
502 action: STATE_SET "visible" 0.0; 512 action: STATE_SET "visible" 0.0;
503 transition: SINUSOIDAL 0.5; 513 transition: SINUSOIDAL 0.5;
504 target: "e.text.label"; 514 target: "e.text.label";
505 target: "bg"; 515 target: "bg";
506 } 516 }
507 program { 517 program { signal: "e,action,hide,label"; source: "e";
508 signal: "e,action,hide,label"; source: "e";
509 action: STATE_SET "default" 0.0; 518 action: STATE_SET "default" 0.0;
510 transition: SINUSOIDAL 1.0; 519 transition: SINUSOIDAL 1.0;
511 target: "e.text.label"; 520 target: "e.text.label";
@@ -543,8 +552,7 @@ group { name: "e/modules/ibox/icon_overlay";
543 action: STATE_SET "disabled" 0.0; 552 action: STATE_SET "disabled" 0.0;
544 target: "item_clip"; 553 target: "item_clip";
545 } 554 }
546 program { 555 program { signal: "e,state,not_urgent"; source: "e";
547 signal: "e,state,not_urgent"; source: "e";
548 script { 556 script {
549 set_int(urgent, 0); 557 set_int(urgent, 0);
550 } 558 }
@@ -554,8 +562,7 @@ group { name: "e/modules/ibox/icon_overlay";
554 action: STATE_SET "default" 0.0; 562 action: STATE_SET "default" 0.0;
555 target: "item_clip"; 563 target: "item_clip";
556 } 564 }
557 program { 565 program { signal: "e,action,exec"; source: "e";
558 signal: "e,action,exec"; source: "e";
559 after: "exec_start"; 566 after: "exec_start";
560 } 567 }
561 program { name: "exec_start"; 568 program { name: "exec_start";
@@ -846,8 +853,7 @@ group { name: "e/modules/ibar/menu/item";
846 } 853 }
847 part { name: "e.swallow.icon"; type: SWALLOW; mouse_events: 0; 854 part { name: "e.swallow.icon"; type: SWALLOW; mouse_events: 0;
848 description { state: "default"; 855 description { state: "default";
849 rel1.to: "icon"; 856 rel.to: "icon";
850 rel2.to: "icon";
851 } 857 }
852 } 858 }
853 part { name: "e.text.title"; type: TEXT; mouse_events: 0; 859 part { name: "e.text.title"; type: TEXT; mouse_events: 0;
@@ -879,14 +885,12 @@ group { name: "e/modules/ibar/menu/item";
879 } 885 }
880 } 886 }
881 programs { 887 programs {
882 program { 888 program { signal: "mouse,in"; source: "event";
883 signal: "mouse,in"; source: "event";
884 action: STATE_SET "focus" 0.0; 889 action: STATE_SET "focus" 0.0;
885 target: "e.text.title"; 890 target: "e.text.title";
886 transition: ACCELERATE 0.2; 891 transition: ACCELERATE 0.2;
887 } 892 }
888 program { 893 program { signal: "mouse,out"; source: "event";
889 signal: "mouse,out"; source: "event";
890 action: STATE_SET "default" 0.0; 894 action: STATE_SET "default" 0.0;
891 target: "e.text.title"; 895 target: "e.text.title";
892 transition: DECELERATE 0.2; 896 transition: DECELERATE 0.2;
diff --git a/data/elementary/themes/edc/icons.edc b/data/elementary/themes/edc/icons.edc
index 5dfa606617..76f578d426 100644
--- a/data/elementary/themes/edc/icons.edc
+++ b/data/elementary/themes/edc/icons.edc
@@ -128,7 +128,6 @@ ICON("preferences-window-maximize", "i-window-maximize")
128ICON("preferences-window-stacking", "i-window-stacking") 128ICON("preferences-window-stacking", "i-window-stacking")
129ICON("preferences-windows-lost", "i-window-lost") 129ICON("preferences-windows-lost", "i-window-lost")
130ICON("preferences-dialogs", "i-dialog") 130ICON("preferences-dialogs", "i-dialog")
131ICON("preferences-illume", "i-mobile")
132ICON("preferences-gradient", "i-gradient") 131ICON("preferences-gradient", "i-gradient")
133ICON("preferences-engine", "i-engine") 132ICON("preferences-engine", "i-engine")
134ICON("preferences-desktop-shelf-bottom-desk", "i-shelf") 133ICON("preferences-desktop-shelf-bottom-desk", "i-shelf")
@@ -275,7 +274,9 @@ ICON("inode/fifo", "i-device-pipe")
275ICON("inode/socket", "i-device-socket") 274ICON("inode/socket", "i-device-socket")
276ICON("inode/symlink", "i-symlink") 275ICON("inode/symlink", "i-symlink")
277 276
277ICON("application/x-iso9660-image", "i-drive-cd")
278ICON("application/x-raw-disk-image", "i-drive-cd") 278ICON("application/x-raw-disk-image", "i-drive-cd")
279ICON("application/x-cue", "i-drive-cd")
279 280
280ICON("application/octet-stream", "i-file2") 281ICON("application/octet-stream", "i-file2")
281 282
@@ -286,8 +287,51 @@ ICON("text/x-csrc", "i-efm-c")
286ICON("text/x-chdr", "i-efm-h") 287ICON("text/x-chdr", "i-efm-h")
287ICON("text/x-c++src", "i-efm-cpp") 288ICON("text/x-c++src", "i-efm-cpp")
288ICON("text/x-c++hdr", "i-efm-hpp") 289ICON("text/x-c++hdr", "i-efm-hpp")
290ICON("text/x-python", "i-efm-py")
291ICON("text/x-python3", "i-efm-py")
292
293ICON("text/x-ruby", "i-efm-rb")
294
295ICON("text/x-perl", "i-efm-pl")
296
297ICON("text/x-patch", "i-efm-txt")
298ICON("text/x-log", "i-efm-txt")
299ICON("text/x-makefile", "i-efm-txt")
300ICON("text/x-subviewer", "i-efm-txt")
301
302ICON("text/html", "i-efm-html")
303ICON("text/css", "i-efm-html")
304ICON("text/json", "i-efm-html")
305
306ICON("application/xhtml+xml", "i-efm-html")
307
308ICON("text/x-gettext-translation", "i-lang")
309ICON("text/x-gettext-translation-template", "i-lang")
310
311ICON("text/x-csharp", "i-efm-code")
312ICON("text/x-hdr", "i-efm-code")
313ICON("text/x-fortran", "i-efm-code")
314ICON("text/x-java-source", "i-efm-code")
315
316ICON("text/x-lua", "i-efm-lua")
317
318ICON("application/x-python", "i-efm-py")
319
320ICON("application/x-ruby", "i-efm-rb")
321
322ICON("application/x-perl", "i-efm-pl")
323
324ICON("application/x-python-bytecode", "i-efm-pyb")
289 325
290ICON("application/x-shellscript", "i-efm-sh") 326ICON("application/x-shellscript", "i-efm-sh")
327
328ICON("application/x-php", "i-efm-php")
329
330ICON("application/x-md5", "i-efm-txt")
331ICON("application/x-m4", "i-efm-txt")
332ICON("application/pkix-attr-cert", "i-efm-txt")
333ICON("application/x-wais-source", "i-efm-txt")
334
291ICON("application/x-executable", "i-efm-exe") 335ICON("application/x-executable", "i-efm-exe")
292ICON("application/x-ms-dos-executable", "i-efm-exe") 336ICON("application/x-ms-dos-executable", "i-efm-exe")
293 337
@@ -304,6 +348,177 @@ ICON("application/x-bzip2-compressed-tar", "i-efm-zip")
304ICON("application/x-7z-compressed-tar", "i-efm-zip") 348ICON("application/x-7z-compressed-tar", "i-efm-zip")
305ICON("application/x-xz-compressed-tar", "i-efm-zip") 349ICON("application/x-xz-compressed-tar", "i-efm-zip")
306ICON("application/vnd.ms-cab-compressed", "i-efm-zip") 350ICON("application/vnd.ms-cab-compressed", "i-efm-zip")
351
352ICON("application/x-gettext-translation", "i-lang")
353ICON("application/x-gettext-translation-template", "i-lang")
354
355ICON("application/xml", "i-efm-html")
356ICON("application/javascript", "i-efm-html")
357ICON("application/json", "i-efm-html")
358
359ICON("application/x-awk", "i-efm-code")
360
361ICON("application/x-deb", "i-efm-deb")
362
363ICON("application/x-font-ttf", "i-font-file")
364ICON("application/x-font-pcf", "i-font-file")
365ICON("application/x-font-pdf", "i-font-file")
366ICON("application/x-font-otf", "i-font-file")
367
368ICON("font/ttf", "i-font-file")
369
370ICON("application/postscript", "i-efm-ps")
371
372ICON("application/pdf", "i-efm-pdf")
373
374ICON("application/acad", "i-efm-cad")
375ICON("application/x-acad", "i-efm-cad")
376ICON("application/autocad_dwg", "i-efm-cad")
377ICON("application/dwg", "i-efm-cad")
378ICON("application/x-dwg", "i-efm-cad")
379ICON("application/x-autocad", "i-efm-cad")
380
381ICON("image/x-dwg", "i-efm-cad")
382ICON("image/vnd.dwg", "i-efm-cad")
383
384ICON("application/vnd.ms-binder", "i-efm-db")
385ICON("application/x-sqlite3", "i-efm-db")
386ICON("chemical/x-cache", "i-efm-db")
387
388ICON("drawing/dwg", "i-efm-cad")
389
390ICON("application/x-object", "i-efm-o")
391
392ICON("application/x-sharedlib", "i-efm-so")
393ICON("application/x-shared-library-la", "i-efm-so")
394
395ICON("application/vnd.oasis.opendocument.spreadsheet", "i-efm-spreadsheet")
396ICON("application/vnd.ms-excel", "i-efm-spreadsheet")
397ICON("application/vnd.stardivision.calc", "i-efm-spreadsheet")
398
399ICON("text/csv", "i-efm-spreadsheet")
400
401ICON("application/vnd.ms-powerpoint", "i-efm-present")
402ICON("application/vnd.oasis.opendocument.presentation", "i-efm-present")
403ICON("application/vnd.stardivision.impress", "i-efm-present")
404
405ICON("application/vnd.oasis.opendocument.text", "i-efm-doc")
406ICON("application/x-msword", "i-efm-doc")
407ICON("application/vnd.openxmlformats-officedocument.wordprocessingml.document", "i-efm-doc")
408ICON("application/vnd.sun.xml.writer", "i-efm-doc")
409ICON("application/vnd.stardivision.writer", "i-efm-doc")
410ICON("application/x-abiword", "i-efm-doc")
411ICON("application/vnd.scribus", "i-efm-doc")
412ICON("application/x-lyx", "i-efm-doc")
413
414ICON("text/markdown", "i-efm-doc")
415
416ICON("application/x-vnd.oasis.opendocument.graphics", "i-efm-draw")
417
418ICON("application/x-vnd.oasis.opendocument.formula", "i-efm-formula")
419
420ICON("application/vnd.openxmlformats-officedocument.wordprocessingml.template", "i-efm-template")
421ICON("application/vnd.openxmlformats-officedocument.spreadsheetml.template", "i-efm-template")
422ICON("application/vnd.openxmlformats-officedocument.presentationml.template", "i-efm-template")
423ICON("application/vnd.oasis.opendocument.chart-template", "i-efm-template")
424ICON("application/vnd.oasis.opendocument.formula-template", "i-efm-template")
425ICON("application/vnd.oasis.opendocument.graphics-template", "i-efm-template")
426ICON("application/vnd.oasis.opendocument.image-template", "i-efm-template")
427ICON("application/vnd.oasis.opendocument.presentation-template", "i-efm-template")
428ICON("application/vnd.oasis.opendocument.spreadsheet-template", "i-efm-template")
429ICON("application/vnd.oasis.opendocument.text-template", "i-efm-template")
430
431ICON("application/x-install-instructions", "i-efm-install")
432
433ICON("application/edje", "i-efm-efile")
434ICON("text/edje", "i-efm-efile")
435
436ICON("image/png", "i-picture-landscape")
437ICON("image/jpeg", "i-picture-landscape")
438ICON("image/gif", "i-picture-landscape")
439ICON("image/bmp", "i-picture-landscape")
440ICON("image/webp", "i-picture-landscape")
441ICON("image/x-compressed-xcf", "i-picture-landscape")
442ICON("application/x-xcf", "i-picture-landscape")
443ICON("application/x-cbz", "i-picture-landscape")
444ICON("application/x-cbr", "i-picture-landscape")
445
446ICON("application/ogg", "i-film")
447ICON("application/vnd.rn-realmedia", "i-film")
448ICON("video/mp4", "i-film")
449ICON("video/mpeg", "i-film")
450ICON("video/ogg", "i-film")
451ICON("video/quicktime", "i-film")
452ICON("video/webm", "i-film")
453ICON("video/x-flv", "i-film")
454ICON("video/x-msvideo", "i-film")
455ICON("video/x-matroska", "i-film")
456ICON("video/x-ms-wmv", "i-film")
457ICON("video/x-theora+ogg", "i-film")
458
459ICON("audio/mpeg", "i-sound")
460ICON("audio/x-wav", "i-sound")
461ICON("audio/x-flac", "i-sound")
462ICON("audio/flac", "i-sound")
463ICON("audio/x-musepack", "i-sound")
464ICON("audio/x-vorbis+ogg", "i-sound")
465ICON("application/x-audacity-project", "i-sound")
466ICON("audio/x-ms-wma", "i-sound")
467ICON("audio/opus", "i-sound")
468ICON("audio/ogg", "i-sound")
469ICON("audio/x-opus+ogg", "i-sound")
470ICON("audio/ape", "i-sound")
471ICON("audio/webm", "i-sound")