enlightenment/terminology
enlightenment
/
terminology
9
6
Fork 7
Code Issues 7 Pull Requests 1 Projects Releases Wiki Activity

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.
This commit is contained in:
Gustavo Sverzut Barbieri 2013-10-11 11:27:18 -03:00
parent 9b1bd2c959
commit 32876f1a6c
5 changed files with 30 additions and 161 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
data/themes/Makefile.am
View File

@ -19,17 +19,17 @@ mustang.edj
EXTRA_DIST = default.edc mild.edc black.edc mustang.edc default_colors.in.edc
default.edj: Makefile default.edc
default.edj: Makefile default.edc default_colors.in.edc
$(EDJE_CC) $(EDJE_FLAGS) \
$(top_srcdir)/data/themes/default.edc \
$(top_builddir)/data/themes/default.edj
mild.edj: Makefile mild.edc
mild.edj: Makefile mild.edc default_colors.in.edc
$(EDJE_CC) $(EDJE_FLAGS) \
$(top_srcdir)/data/themes/mild.edc \
$(top_builddir)/data/themes/mild.edj
black.edj: Makefile black.edc mild.edc
black.edj: Makefile black.edc mild.edc default_colors.in.edc
$(EDJE_CC) $(EDJE_FLAGS) \
$(top_srcdir)/data/themes/black.edc \
$(top_builddir)/data/themes/black.edj
@ -46,7 +46,7 @@ solarized_light.edj: Makefile default.edc
$(top_srcdir)/data/themes/default.edc \
$(top_builddir)/data/themes/solarized_light.edj
mustang.edj: Makefile mustang.edc
mustang.edj: Makefile mustang.edc mild.edc default_colors.in.edc
$(EDJE_CC) $(EDJE_FLAGS) \
$(top_srcdir)/data/themes/mustang.edc \
$(top_builddir)/data/themes/mustang.edj

70
data/themes/default.edc
View File

@ -171,75 +171,7 @@ collections {
}
#else
color_classes {
color_class { name: "color-0"; color: 170 170 170 255; } // COL_DEF
color_class { name: "color-1"; color: 0 0 0 255; } // COL_BLACK
color_class { name: "color-2"; color: 204 51 51 255; } // COL_RED
color_class { name: "color-3"; color: 51 204 51 255; } // COL_GREEN
color_class { name: "color-4"; color: 204 136 51 255; } // COL_YELLOW
color_class { name: "color-5"; color: 51 51 204 255; } // COL_BLUE
color_class { name: "color-6"; color: 204 51 204 255; } // COL_MAGENTA
color_class { name: "color-7"; color: 51 204 204 255; } // COL_CYAN
color_class { name: "color-8"; color: 204 204 204 255; } // COL_WHITE
color_class { name: "color-9"; color: 0 0 0 0; } // COL_INVIS
color_class { name: "color-10"; color: 34 34 34 255; } // COL_INVERSE
color_class { name: "color-11"; color: 170 170 170 255; } // COL_INVERSEBG
color_class { name: "color-12"; color: 238 238 238 255; } // COL_DEF
color_class { name: "color-13"; color: 102 102 102 255; } // COL_BLACK
color_class { name: "color-14"; color: 255 102 102 255; } // COL_RED
color_class { name: "color-15"; color: 102 255 102 255; } // COL_GREEN
color_class { name: "color-16"; color: 255 255 102 255; } // COL_YELLOW
color_class { name: "color-17"; color: 102 102 255 255; } // COL_BLUE
color_class { name: "color-18"; color: 255 102 255 255; } // COL_MAGENTA
color_class { name: "color-19"; color: 102 255 255 255; } // COL_CYAN
color_class { name: "color-20"; color: 255 255 255 255; } // COL_WHITE
color_class { name: "color-21"; color: 0 0 0 0; } // COL_INVIS
color_class { name: "color-22"; color: 17 17 17 255; } // COL_INVERSE
color_class { name: "color-23"; color: 238 238 238 255; } // COL_INVERSEBG
color_class { name: "color-24"; color: 221 221 221 255; } // COL_DEF
color_class { name: "color-25"; color: 0 0 0 255; } // COL_BLACK
color_class { name: "color-26"; color: 204 136 136 255; } // COL_RED
color_class { name: "color-27"; color: 136 204 136 255; } // COL_GREEN
color_class { name: "color-28"; color: 204 170 136 255; } // COL_YELLOW
color_class { name: "color-29"; color: 136 136 204 255; } // COL_BLUE
color_class { name: "color-30"; color: 204 136 204 255; } // COL_MAGENTA
color_class { name: "color-31"; color: 136 204 204 255; } // COL_CYAN
color_class { name: "color-32"; color: 204 204 204 255; } // COL_WHITE
color_class { name: "color-33"; color: 0 0 0 0; } // COL_INVIS
color_class { name: "color-34"; color: 17 17 17 255; } // COL_INVERSE
color_class { name: "color-35"; color: 204 204 204 255; } // COL_INVERSEBG
color_class { name: "color-36"; color: 255 255 255 255; } // COL_DEF
color_class { name: "color-37"; color: 204 204 204 255; } // COL_BLACK
color_class { name: "color-38"; color: 255 204 204 255; } // COL_RED
color_class { name: "color-39"; color: 204 255 204 255; } // COL_GREEN
color_class { name: "color-40"; color: 255 255 204 255; } // COL_YELLOW
color_class { name: "color-41"; color: 204 204 255 255; } // COL_BLUE
color_class { name: "color-42"; color: 255 204 255 255; } // COL_MAGENTA
color_class { name: "color-43"; color: 204 255 255 255; } // COL_CYAN
color_class { name: "color-44"; color: 255 255 255 255; } // COL_WHITE
color_class { name: "color-45"; color: 0 0 0 0; } // COL_INVIS
color_class { name: "color-46"; color: 0 0 0 255; } // COL_INVERSE
color_class { name: "color-47"; color: 255 255 255 255; } // COL_INVERSEBG
color_class { name: "256color-0"; color: 0 0 0 255; } // COL_BLACK
color_class { name: "256color-1"; color: 204 51 51 255; } // COL_RED
color_class { name: "256color-2"; color: 51 204 51 255; } // COL_GREEN
color_class { name: "256color-3"; color: 204 136 51 255; } // COL_YELLOW
color_class { name: "256color-4"; color: 51 51 204 255; } // COL_BLUE
color_class { name: "256color-5"; color: 204 51 204 255; } // COL_MAGENTA
color_class { name: "256color-6"; color: 51 204 204 255; } // COL_CYAN
color_class { name: "256color-7"; color: 204 204 204 255; } // COL_WHITE
color_class { name: "256color-8"; color: 102 102 102 255; } // COL_BLACK
color_class { name: "256color-9"; color: 255 102 102 255; } // COL_RED
color_class { name: "256color-10"; color: 102 255 102 255; } // COL_GREEN
color_class { name: "256color-11"; color: 255 255 102 255; } // COL_YELLOW
color_class { name: "256color-12"; color: 102 102 255 255; } // COL_BLUE
color_class { name: "256color-13"; color: 255 102 255 255; } // COL_MAGENTA
color_class { name: "256color-14"; color: 102 255 255 255; } // COL_CYAN
color_class { name: "256color-15"; color: 255 255 255 255; } // COL_WHITE
#include "default_colors.in.edc"
}
#endif
images {

31
data/themes/default_colors.in.edc
View File

@ -51,23 +51,24 @@ color_class { name: "color-46"; color: 0 0 0 255; } // COL_INVERSE
color_class { name: "color-47"; color: 255 255 255 255; } // COL_INVERSEBG
color_class { name: "256color-0"; color: 0 0 0 255; } // COL_BLACK
color_class { name: "256color-1"; color: 192 0 0 255; } // COL_RED
color_class { name: "256color-2"; color: 0 192 0 255; } // COL_GREEN
color_class { name: "256color-3"; color: 192 192 0 255; } // COL_YELLOW
color_class { name: "256color-4"; color: 0 0 192 255; } // COL_BLUE
color_class { name: "256color-5"; color: 192 0 192 255; } // COL_MAGENTA
color_class { name: "256color-6"; color: 0 192 192 255; } // COL_CYAN
color_class { name: "256color-7"; color: 192 192 192 255; } // COL_WHITE
color_class { name: "256color-1"; color: 204 51 51 255; } // COL_RED
color_class { name: "256color-2"; color: 51 204 51 255; } // COL_GREEN
color_class { name: "256color-3"; color: 204 136 51 255; } // COL_YELLOW
color_class { name: "256color-4"; color: 51 51 204 255; } // COL_BLUE
color_class { name: "256color-5"; color: 204 51 204 255; } // COL_MAGENTA
color_class { name: "256color-6"; color: 51 204 204 255; } // COL_CYAN
color_class { name: "256color-7"; color: 204 204 204 255; } // COL_WHITE
color_class { name: "256color-8"; color: 128 128 128 255; } // COL_BLACK
color_class { name: "256color-9"; color: 255 128 128 255; } // COL_RED
color_class { name: "256color-10"; color: 128 255 128 255; } // COL_GREEN
color_class { name: "256color-11"; color: 255 255 128 255; } // COL_YELLOW
color_class { name: "256color-12"; color: 128 128 255 255; } // COL_BLUE
color_class { name: "256color-13"; color: 255 128 255 255; } // COL_MAGENTA
color_class { name: "256color-14"; color: 128 255 255 255; } // COL_CYAN
color_class { name: "256color-8"; color: 102 102 102 255; } // COL_BLACK
color_class { name: "256color-9"; color: 255 102 102 255; } // COL_RED
color_class { name: "256color-10"; color: 102 255 102 255; } // COL_GREEN
color_class { name: "256color-11"; color: 255 255 102 255; } // COL_YELLOW
color_class { name: "256color-12"; color: 102 102 255 255; } // COL_BLUE
color_class { name: "256color-13"; color: 255 102 255 255; } // COL_MAGENTA
color_class { name: "256color-14"; color: 102 255 255 255; } // COL_CYAN
color_class { name: "256color-15"; color: 255 255 255 255; } // COL_WHITE
#if 0 // disabled, use defaults.
// pure 6x6x6 colorcube
color_class { name: "256color-16"; color: 0 0 0 255; }
color_class { name: "256color-17"; color: 0 0 42 255; }
@ -346,3 +347,5 @@ color_class { name: "256color-252"; color: 210 210 210 255; }
color_class { name: "256color-253"; color: 218 218 218 255; }
color_class { name: "256color-254"; color: 228 228 228 255; }
color_class { name: "256color-255"; color: 238 238 238 255; }
#endif

73
data/themes/mild.edc
View File

@ -16,78 +16,11 @@
collections {
group { name: "terminology/background";
/* same as from default.edc (not solarized) */
#ifndef INHERIT_PROVIDE_OWN_COLORS
color_classes {
color_class { name: "color-0"; color: 170 170 170 255; } // COL_DEF
color_class { name: "color-1"; color: 0 0 0 255; } // COL_BLACK
color_class { name: "color-2"; color: 204 51 51 255; } // COL_RED
color_class { name: "color-3"; color: 51 204 51 255; } // COL_GREEN
color_class { name: "color-4"; color: 204 136 51 255; } // COL_YELLOW
color_class { name: "color-5"; color: 51 51 204 255; } // COL_BLUE
color_class { name: "color-6"; color: 204 51 204 255; } // COL_MAGENTA
color_class { name: "color-7"; color: 51 204 204 255; } // COL_CYAN
color_class { name: "color-8"; color: 204 204 204 255; } // COL_WHITE
color_class { name: "color-9"; color: 0 0 0 0; } // COL_INVIS
color_class { name: "color-10"; color: 34 34 34 255; } // COL_INVERSE
color_class { name: "color-11"; color: 170 170 170 255; } // COL_INVERSEBG
color_class { name: "color-12"; color: 238 238 238 255; } // COL_DEF
color_class { name: "color-13"; color: 102 102 102 255; } // COL_BLACK
color_class { name: "color-14"; color: 255 102 102 255; } // COL_RED
color_class { name: "color-15"; color: 102 255 102 255; } // COL_GREEN
color_class { name: "color-16"; color: 255 255 102 255; } // COL_YELLOW
color_class { name: "color-17"; color: 102 102 255 255; } // COL_BLUE
color_class { name: "color-18"; color: 255 102 255 255; } // COL_MAGENTA
color_class { name: "color-19"; color: 102 255 255 255; } // COL_CYAN
color_class { name: "color-20"; color: 255 255 255 255; } // COL_WHITE
color_class { name: "color-21"; color: 0 0 0 0; } // COL_INVIS
color_class { name: "color-22"; color: 17 17 17 255; } // COL_INVERSE
color_class { name: "color-23"; color: 238 238 238 255; } // COL_INVERSEBG
color_class { name: "color-24"; color: 221 221 221 255; } // COL_DEF
color_class { name: "color-25"; color: 0 0 0 255; } // COL_BLACK
color_class { name: "color-26"; color: 204 136 136 255; } // COL_RED
color_class { name: "color-27"; color: 136 204 136 255; } // COL_GREEN
color_class { name: "color-28"; color: 204 170 136 255; } // COL_YELLOW
color_class { name: "color-29"; color: 136 136 204 255; } // COL_BLUE
color_class { name: "color-30"; color: 204 136 204 255; } // COL_MAGENTA
color_class { name: "color-31"; color: 136 204 204 255; } // COL_CYAN
color_class { name: "color-32"; color: 204 204 204 255; } // COL_WHITE
color_class { name: "color-33"; color: 0 0 0 0; } // COL_INVIS
color_class { name: "color-34"; color: 17 17 17 255; } // COL_INVERSE
color_class { name: "color-35"; color: 204 204 204 255; } // COL_INVERSEBG
color_class { name: "color-36"; color: 255 255 255 255; } // COL_DEF
color_class { name: "color-37"; color: 204 204 204 255; } // COL_BLACK
color_class { name: "color-38"; color: 255 204 204 255; } // COL_RED
color_class { name: "color-39"; color: 204 255 204 255; } // COL_GREEN
color_class { name: "color-40"; color: 255 255 204 255; } // COL_YELLOW
color_class { name: "color-41"; color: 204 204 255 255; } // COL_BLUE
color_class { name: "color-42"; color: 255 204 255 255; } // COL_MAGENTA
color_class { name: "color-43"; color: 204 255 255 255; } // COL_CYAN
color_class { name: "color-44"; color: 255 255 255 255; } // COL_WHITE
color_class { name: "color-45"; color: 0 0 0 0; } // COL_INVIS
color_class { name: "color-46"; color: 0 0 0 255; } // COL_INVERSE
color_class { name: "color-47"; color: 255 255 255 255; } // COL_INVERSEBG
color_class { name: "256color-0"; color: 0 0 0 255; } // COL_BLACK
color_class { name: "256color-1"; color: 204 51 51 255; } // COL_RED
color_class { name: "256color-2"; color: 51 204 51 255; } // COL_GREEN
color_class { name: "256color-3"; color: 204 136 51 255; } // COL_YELLOW
color_class { name: "256color-4"; color: 51 51 204 255; } // COL_BLUE
color_class { name: "256color-5"; color: 204 51 204 255; } // COL_MAGENTA
color_class { name: "256color-6"; color: 51 204 204 255; } // COL_CYAN
color_class { name: "256color-7"; color: 204 204 204 255; } // COL_WHITE
color_class { name: "256color-8"; color: 102 102 102 255; } // COL_BLACK
color_class { name: "256color-9"; color: 255 102 102 255; } // COL_RED
color_class { name: "256color-10"; color: 102 255 102 255; } // COL_GREEN
color_class { name: "256color-11"; color: 255 255 102 255; } // COL_YELLOW
color_class { name: "256color-12"; color: 102 102 255 255; } // COL_BLUE
color_class { name: "256color-13"; color: 255 102 255 255; } // COL_MAGENTA
color_class { name: "256color-14"; color: 102 255 255 255; } // COL_CYAN
color_class { name: "256color-15"; color: 255 255 255 255; } // COL_WHITE
#include "default_colors.in.edc"
}
#endif
images {
image: "bg_bevel.png" COMP;

1
data/themes/mustang.edc
View File

@ -1,6 +1,7 @@
#define BG_COLOR 26 26 26 255
#define BG_COLOR_TRANSLUCENT 26 26 26 200
#define BELL_OVERLAY_COLOR 220 220 220 32
#define INHERIT_PROVIDE_OWN_COLORS 1
collections {
color_classes {