summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGustavo Sverzut Barbieri <barbieri@profusion.mobi>2013-10-11 11:27:18 -0300
committerGustavo Sverzut Barbieri <barbieri@profusion.mobi>2013-10-11 11:27:18 -0300
commit32876f1a6cebd0853be7bb1953c26f603ae2d4a6 (patch)
treeaaa56d6fbe885091721e0e5f843b2ad8475fe6ff
parent9b1bd2c95907ac1571adefcdf601ed50c9590f0c (diff)
unify default colors, fix make dependencies and mustang build.
- there was an unused default_colors.in.edc that provided the same colors as default.edc, with an extra set of colors for 6x6 colorcube of colors over 16. The extra colors were disabled and the file is now used everywhere that need those colors (mild.edc and default.edc) - mustang.edc included mild.edc but did not depend on it, that's why the build break as I changed mild and recompiled, but mustang.edj was already there and the lack of dependency didn't ask it to be rebuilt. - mustang.edc will define INHERIT_PROVIDE_OWN_COLORS so it can provide its own colors.
-rw-r--r--data/themes/Makefile.am8
-rw-r--r--data/themes/default.edc70
-rw-r--r--data/themes/default_colors.in.edc39
-rw-r--r--data/themes/mild.edc77
-rw-r--r--data/themes/mustang.edc1
5 files changed, 32 insertions, 163 deletions
diff --git a/data/themes/Makefile.am b/data/themes/Makefile.am
index 2ba7d14..ddba655 100644
--- a/data/themes/Makefile.am
+++ b/data/themes/Makefile.am
@@ -19,17 +19,17 @@ mustang.edj
19 19
20EXTRA_DIST = default.edc mild.edc black.edc mustang.edc default_colors.in.edc 20EXTRA_DIST = default.edc mild.edc black.edc mustang.edc default_colors.in.edc
21 21
22default.edj: Makefile default.edc 22default.edj: Makefile default.edc default_colors.in.edc
23 $(EDJE_CC) $(EDJE_FLAGS) \ 23 $(EDJE_CC) $(EDJE_FLAGS) \
24 $(top_srcdir)/data/themes/default.edc \ 24 $(top_srcdir)/data/themes/default.edc \
25 $(top_builddir)/data/themes/default.edj 25 $(top_builddir)/data/themes/default.edj
26 26
27mild.edj: Makefile mild.edc 27mild.edj: Makefile mild.edc default_colors.in.edc
28 $(EDJE_CC) $(EDJE_FLAGS) \ 28 $(EDJE_CC) $(EDJE_FLAGS) \
29 $(top_srcdir)/data/themes/mild.edc \ 29 $(top_srcdir)/data/themes/mild.edc \
30 $(top_builddir)/data/themes/mild.edj 30 $(top_builddir)/data/themes/mild.edj
31 31
32black.edj: Makefile black.edc mild.edc 32black.edj: Makefile black.edc mild.edc default_colors.in.edc
33 $(EDJE_CC) $(EDJE_FLAGS) \ 33 $(EDJE_CC) $(EDJE_FLAGS) \
34 $(top_srcdir)/data/themes/black.edc \ 34 $(top_srcdir)/data/themes/black.edc \
35 $(top_builddir)/data/themes/black.edj 35 $(top_builddir)/data/themes/black.edj
@@ -46,7 +46,7 @@ solarized_light.edj: Makefile default.edc
46 $(top_srcdir)/data/themes/default.edc \ 46 $(top_srcdir)/data/themes/default.edc \
47 $(top_builddir)/data/themes/solarized_light.edj 47 $(top_builddir)/data/themes/solarized_light.edj
48 48
49mustang.edj: Makefile mustang.edc 49mustang.edj: Makefile mustang.edc mild.edc default_colors.in.edc
50 $(EDJE_CC) $(EDJE_FLAGS) \ 50 $(EDJE_CC) $(EDJE_FLAGS) \
51 $(top_srcdir)/data/themes/mustang.edc \ 51 $(top_srcdir)/data/themes/mustang.edc \
52 $(top_builddir)/data/themes/mustang.edj 52 $(top_builddir)/data/themes/mustang.edj
diff --git a/data/themes/default.edc b/data/themes/default.edc
index 5900d67..5aba3cf 100644
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -171,75 +171,7 @@ collections {
171 } 171 }
172#else 172#else
173 color_classes { 173 color_classes {
174 color_class { name: "color-0"; color: 170 170 170 255; } // COL_DEF 174#include "default_colors.in.edc"
175 color_class { name: "color-1"; color: 0 0 0 255; } // COL_BLACK
176 color_class { name: "color-2"; color: 204 51 51 255; } // COL_RED
177 color_class { name: "color-3"; color: 51 204 51 255; } // COL_GREEN
178 color_class { name: "color-4"; color: 204 136 51 255; } // COL_YELLOW
179 color_class { name: "color-5"; color: 51 51 204 255; } // COL_BLUE
180 color_class { name: "color-6"; color: 204 51 204 255; } // COL_MAGENTA
181 color_class { name: "color-7"; color: 51 204 204 255; } // COL_CYAN
182 color_class { name: "color-8"; color: 204 204 204 255; } // COL_WHITE
183 color_class { name: "color-9"; color: 0 0 0 0; } // COL_INVIS
184 color_class { name: "color-10"; color: 34 34 34 255; } // COL_INVERSE
185 color_class { name: "color-11"; color: 170 170 170 255; } // COL_INVERSEBG
186
187 color_class { name: "color-12"; color: 238 238 238 255; } // COL_DEF
188 color_class { name: "color-13"; color: 102 102 102 255; } // COL_BLACK
189 color_class { name: "color-14"; color: 255 102 102 255; } // COL_RED
190 color_class { name: "color-15"; color: 102 255 102 255; } // COL_GREEN
191 color_class { name: "color-16"; color: 255 255 102 255; } // COL_YELLOW
192 color_class { name: "color-17"; color: 102 102 255 255; } // COL_BLUE
193 color_class { name: "color-18"; color: 255 102 255 255; } // COL_MAGENTA
194 color_class { name: "color-19"; color: 102 255 255 255; } // COL_CYAN
195 color_class { name: "color-20"; color: 255 255 255 255; } // COL_WHITE
196 color_class { name: "color-21"; color: 0 0 0 0; } // COL_INVIS
197 color_class { name: "color-22"; color: 17 17 17 255; } // COL_INVERSE
198 color_class { name: "color-23"; color: 238 238 238 255; } // COL_INVERSEBG
199
200 color_class { name: "color-24"; color: 221 221 221 255; } // COL_DEF
201 color_class { name: "color-25"; color: 0 0 0 255; } // COL_BLACK
202 color_class { name: "color-26"; color: 204 136 136 255; } // COL_RED
203 color_class { name: "color-27"; color: 136 204 136 255; } // COL_GREEN
204 color_class { name: "color-28"; color: 204 170 136 255; } // COL_YELLOW
205 color_class { name: "color-29"; color: 136 136 204 255; } // COL_BLUE
206 color_class { name: "color-30"; color: 204 136 204 255; } // COL_MAGENTA
207 color_class { name: "color-31"; color: 136 204 204 255; } // COL_CYAN
208 color_class { name: "color-32"; color: 204 204 204 255; } // COL_WHITE
209 color_class { name: "color-33"; color: 0 0 0 0; } // COL_INVIS
210 color_class { name: "color-34"; color: 17 17 17 255; } // COL_INVERSE
211 color_class { name: "color-35"; color: 204 204 204 255; } // COL_INVERSEBG
212
213 color_class { name: "color-36"; color: 255 255 255 255; } // COL_DEF
214 color_class { name: "color-37"; color: 204 204 204 255; } // COL_BLACK
215 color_class { name: "color-38"; color: 255 204 204 255; } // COL_RED
216 color_class { name: "color-39"; color: 204 255 204 255; } // COL_GREEN
217 color_class { name: "color-40"; color: 255 255 204 255; } // COL_YELLOW
218 color_class { name: "color-41"; color: 204 204 255 255; } // COL_BLUE
219 color_class { name: "color-42"; color: 255 204 255 255; } // COL_MAGENTA
220 color_class { name: "color-43"; color: 204 255 255 255; } // COL_CYAN
221 color_class { name: "color-44"; color: 255 255 255 255; } // COL_WHITE
222 color_class { name: "color-45"; color: 0 0 0 0; } // COL_INVIS
223 color_class { name: "color-46"; color: 0 0 0 255; } // COL_INVERSE
224 color_class { name: "color-47"; color: 255 255 255 255; } // COL_INVERSEBG
225
226 color_class { name: "256color-0"; color: 0 0 0 255; } // COL_BLACK
227 color_class { name: "256color-1"; color: 204 51 51 255; } // COL_RED
228 color_class { name: "256color-2"; color: 51 204 51 255; } // COL_GREEN
229 color_class { name: "256color-3"; color: 204 136 51 255; } // COL_YELLOW
230 color_class { name: "256color-4"; color: 51 51 204 255; } // COL_BLUE
231 color_class { name: "256color-5"; color: 204 51 204 255; } // COL_MAGENTA
232 color_class { name: "256color-6"; color: 51 204 204 255; } // COL_CYAN
233 color_class { name: "256color-7"; color: 204 204 204 255; } // COL_WHITE
234
235 color_class { name: "256color-8"; color: 102 102 102 255; } // COL_BLACK
236 color_class { name: "256color-9"; color: 255 102 102 255; } // COL_RED
237 color_class { name: "256color-10"; color: 102 255 102 255; } // COL_GREEN
238 color_class { name: "256color-11"; color: 255 255 102 255; } // COL_YELLOW
239 color_class { name: "256color-12"; color: 102 102 255 255; } // COL_BLUE
240 color_class { name: "256color-13"; color: 255 102 255 255; } // COL_MAGENTA
241 color_class { name: "256color-14"; color: 102 255 255 255; } // COL_CYAN
242 color_class { name: "256color-15"; color: 255 255 255 255; } // COL_WHITE
243 } 175 }
244#endif 176#endif
245 images { 177 images {
diff --git a/data/themes/default_colors.in.edc b/data/themes/default_colors.in.edc
index 3e32909..5f78602 100644
--- a/data/themes/default_colors.in.edc
+++ b/data/themes/default_colors.in.edc
@@ -50,24 +50,25 @@ color_class { name: "color-45"; color: 0 0 0 0; } // COL_INVIS
50color_class { name: "color-46"; color: 0 0 0 255; } // COL_INVERSE 50color_class { name: "color-46"; color: 0 0 0 255; } // COL_INVERSE
51color_class { name: "color-47"; color: 255 255 255 255; } // COL_INVERSEBG 51color_class { name: "color-47"; color: 255 255 255 255; } // COL_INVERSEBG
52 52
53color_class { name: "256color-0"; color: 0 0 0 255; } // COL_BLACK 53color_class { name: "256color-0"; color: 0 0 0 255; } // COL_BLACK
54color_class { name: "256color-1"; color: 192 0 0 255; } // COL_RED 54color_class { name: "256color-1"; color: 204 51 51 255; } // COL_RED
55color_class { name: "256color-2"; color: 0 192 0 255; } // COL_GREEN 55color_class { name: "256color-2"; color: 51 204 51 255; } // COL_GREEN
56color_class { name: "256color-3"; color: 192 192 0 255; } // COL_YELLOW 56color_class { name: "256color-3"; color: 204 136 51 255; } // COL_YELLOW
57color_class { name: "256color-4"; color: 0 0 192 255; } // COL_BLUE 57color_class { name: "256color-4"; color: 51 51 204 255; } // COL_BLUE
58color_class { name: "256color-5"; color: 192 0 192 255; } // COL_MAGENTA 58color_class { name: "256color-5"; color: 204 51 204 255; } // COL_MAGENTA
59color_class { name: "256color-6"; color: 0 192 192 255; } // COL_CYAN 59color_class { name: "256color-6"; color: 51 204 204 255; } // COL_CYAN
60color_class { name: "256color-7"; color: 192 192 192 255; } // COL_WHITE 60color_class { name: "256color-7"; color: 204 204 204 255; } // COL_WHITE
61 61
62color_class { name: "256color-8"; color: 128 128 128 255; } // COL_BLACK 62color_class { name: "256color-8"; color: 102 102 102 255; } // COL_BLACK
63color_class { name: "256color-9"; color: 255 128 128 255; } // COL_RED 63color_class { name: "256color-9"; color: 255 102 102 255; } // COL_RED
64color_class { name: "256color-10"; color: 128 255 128 255; } // COL_GREEN 64color_class { name: "256color-10"; color: 102 255 102 255; } // COL_GREEN
65color_class { name: "256color-11"; color: 255 255 128 255; } // COL_YELLOW 65color_class { name: "256color-11"; color: 255 255 102 255; } // COL_YELLOW
66color_class { name: "256color-12"; color: 128 128 255 255; } // COL_BLUE 66color_class { name: "256color-12"; color: 102 102 255 255; } // COL_BLUE
67color_class { name: "256color-13"; color: 255 128 255 255; } // COL_MAGENTA 67color_class { name: "256color-13"; color: 255 102 255 255; } // COL_MAGENTA
68color_class { name: "256color-14"; color: 128 255 255 255; } // COL_CYAN 68color_class { name: "256color-14"; color: 102 255 255 255; } // COL_CYAN
69color_class { name: "256color-15"; color: 255 255 255 255; } // COL_WHITE 69color_class { name: "256color-15"; color: 255 255 255 255; } // COL_WHITE
70 70
71#if 0 // disabled, use defaults.
71// pure 6x6x6 colorcube 72// pure 6x6x6 colorcube
72color_class { name: "256color-16"; color: 0 0 0 255; } 73color_class { name: "256color-16"; color: 0 0 0 255; }
73color_class { name: "256color-17"; color: 0 0 42 255; } 74color_class { name: "256color-17"; color: 0 0 42 255; }
@@ -346,3 +347,5 @@ color_class { name: "256color-252"; color: 210 210 210 255; }
346color_class { name: "256color-253"; color: 218 218 218 255; } 347color_class { name: "256color-253"; color: 218 218 218 255; }
347color_class { name: "256color-254"; color: 228 228 228 255; } 348color_class { name: "256color-254"; color: 228 228 228 255; }
348color_class { name: "256color-255"; color: 238 238 238 255; } 349color_class { name: "256color-255"; color: 238 238 238 255; }
350
351#endif
diff --git a/data/themes/mild.edc b/data/themes/mild.edc
index e86ed3c..9c6538c 100644
--- a/data/themes/mild.edc
+++ b/data/themes/mild.edc
@@ -16,78 +16,11 @@
16collections { 16collections {
17 group { name: "terminology/background"; 17 group { name: "terminology/background";
18 18
19 /* same as from default.edc (not solarized) */ 19#ifndef INHERIT_PROVIDE_OWN_COLORS
20 color_classes { 20 color_classes {
21 color_class { name: "color-0"; color: 170 170 170 255; } // COL_DEF 21#include "default_colors.in.edc"
22 color_class { name: "color-1"; color: 0 0 0 255; } // COL_BLACK 22 }
23 color_class { name: "color-2"; color: 204 51 51 255; } // COL_RED 23#endif
24 color_class { name: "color-3"; color: 51 204 51 255; } // COL_GREEN
25 color_class { name: "color-4"; color: 204 136 51 255; } // COL_YELLOW
26 color_class { name: "color-5"; color: 51 51 204 255; } // COL_BLUE
27 color_class { name: "color-6"; color: 204 51 204 255; } // COL_MAGENTA
28 color_class { name: "color-7"; color: 51 204 204 255; } // COL_CYAN
29 color_class { name: "color-8"; color: 204 204 204 255; } // COL_WHITE
30 color_class { name: "color-9"; color: 0 0 0 0; } // COL_INVIS
31 color_class { name: "color-10"; color: 34 34 34 255; } // COL_INVERSE
32 color_class { name: "color-11"; color: 170 170 170 255; } // COL_INVERSEBG
33
34 color_class { name: "color-12"; color: 238 238 238 255; } // COL_DEF
35 color_class { name: "color-13"; color: 102 102 102 255; } // COL_BLACK
36 color_class { name: "color-14"; color: 255 102 102 255; } // COL_RED
37 color_class { name: "color-15"; color: 102 255 102 255; } // COL_GREEN
38 color_class { name: "color-16"; color: 255 255 102 255; } // COL_YELLOW
39 color_class { name: "color-17"; color: 102 102 255 255; } // COL_BLUE
40 color_class { name: "color-18"; color: 255 102 255 255; } // COL_MAGENTA
41 color_class { name: "color-19"; color: 102 255 255 255; } // COL_CYAN
42 color_class { name: "color-20"; color: 255 255 255 255; } // COL_WHITE
43 color_class { name: "color-21"; color: 0 0 0 0; } // COL_INVIS
44 color_class { name: "color-22"; color: 17 17 17 255; } // COL_INVERSE
45 color_class { name: "color-23"; color: 238 238 238 255; } // COL_INVERSEBG
46
47 color_class { name: "color-24"; color: 221 221 221 255; } // COL_DEF
48 color_class { name: "color-25"; color: 0 0 0 255; } // COL_BLACK
49 color_class { name: "color-26"; color: 204 136 136 255; } // COL_RED
50 color_class { name: "color-27"; color: 136 204 136 255; } // COL_GREEN
51 color_class { name: "color-28"; color: 204 170 136 255; } // COL_YELLOW
52 color_class { name: "color-29"; color: 136 136 204 255; } // COL_BLUE
53 color_class { name: "color-30"; color: 204 136 204 255; } // COL_MAGENTA
54 color_class { name: "color-31"; color: 136 204 204 255; } // COL_CYAN
55 color_class { name: "color-32"; color: 204 204 204 255; } // COL_WHITE
56 color_class { name: "color-33"; color: 0 0 0 0; } // COL_INVIS
57 color_class { name: "color-34"; color: 17 17 17 255; } // COL_INVERSE
58 color_class { name: "color-35"; color: 204 204 204 255; } // COL_INVERSEBG
59
60 color_class { name: "color-36"; color: 255 255 255 255; } // COL_DEF
61 color_class { name: "color-37"; color: 204 204 204 255; } // COL_BLACK
62 color_class { name: "color-38"; color: 255 204 204 255; } // COL_RED
63 color_class { name: "color-39"; color: 204 255 204 255; } // COL_GREEN
64 color_class { name: "color-40"; color: 255 255 204 255; } // COL_YELLOW
65 color_class { name: "color-41"; color: 204 204 255 255; } // COL_BLUE
66 color_class { name: "color-42"; color: 255 204 255 255; } // COL_MAGENTA
67 color_class { name: "color-43"; color: 204 255 255 255; } // COL_CYAN
68 color_class { name: "color-44"; color: 255 255 255 255; } // COL_WHITE
69 color_class { name: "color-45"; color: 0 0 0 0; } // COL_INVIS
70 color_class { name: "color-46"; color: 0 0 0 255; } // COL_INVERSE
71 color_class { name: "color-47"; color: 255 255 255 255; } // COL_INVERSEBG
72
73 color_class { name: "256color-0"; color: 0 0 0 255; } // COL_BLACK
74 color_class { name: "256color-1"; color: 204 51 51 255; } // COL_RED
75 color_class { name: "256color-2"; color: 51 204 51 255; } // COL_GREEN
76 color_class { name: "256color-3"; color: 204 136 51 255; } // COL_YELLOW
77 color_class { name: "256color-4"; color: 51 51 204 255; } // COL_BLUE
78 color_class { name: "256color-5"; color: 204 51 204 255; } // COL_MAGENTA
79 color_class { name: "256color-6"; color: 51 204 204 255; } // COL_CYAN
80 color_class { name: "256color-7"; color: 204 204 204 255; } // COL_WHITE
81
82 color_class { name: "256color-8"; color: 102 102 102 255; } // COL_BLACK
83 color_class { name: "256color-9"; color: 255 102 102 255; } // COL_RED
84 color_class { name: "256color-10"; color: 102 255 102 255; } // COL_GREEN
85 color_class { name: "256color-11"; color: 255 255 102 255; } // COL_YELLOW
86 color_class { name: "256color-12"; color: 102 102 255 255; } // COL_BLUE
87 color_class { name: "256color-13"; color: 255 102 255 255; } // COL_MAGENTA
88 color_class { name: "256color-14"; color: 102 255 255 255; } // COL_CYAN
89 color_class { name: "256color-15"; color: 255 255 255 255; } // COL_WHITE
90 }
91 24
92 images { 25 images {
93 image: "bg_bevel.png" COMP; 26 image: "bg_bevel.png" COMP;
diff --git a/data/themes/mustang.edc b/data/themes/mustang.edc
index 9ac996e..71d7e83 100644
--- a/data/themes/mustang.edc
+++ b/data/themes/mustang.edc
@@ -1,6 +1,7 @@
1#define BG_COLOR 26 26 26 255 1#define BG_COLOR 26 26 26 255
2#define BG_COLOR_TRANSLUCENT 26 26 26 200 2#define BG_COLOR_TRANSLUCENT 26 26 26 200
3#define BELL_OVERLAY_COLOR 220 220 220 32 3#define BELL_OVERLAY_COLOR 220 220 220 32
4#define INHERIT_PROVIDE_OWN_COLORS 1
4 5
5collections { 6collections {
6 color_classes { 7 color_classes {