theme - move solarized to 2 edc files that #include default

This commit is contained in:
Carsten Haitzler 2013-12-25 13:18:01 +09:00
parent a5adff345e
commit f424fd9bbe
4 changed files with 157 additions and 106 deletions

View File

@ -21,8 +21,14 @@ AM_V_EDJ = $(am__v_EDJ_$(V))
am__v_EDJ_ = $(am__v_EDJ_$(AM_DEFAULT_VERBOSITY))
am__v_EDJ_0 = @echo " EDJ " $@;
EXTRA_DIST = default.edc mild.edc black.edc mustang.edc default_colors.in.edc
EXTRA_DIST = \
default.edc \
mild.edc \
black.edc \
mustang.edc \
solarized.edc \
solarized_light.edc \
default_colors.in.edc
default.edj: Makefile default.edc default_colors.in.edc
$(AM_V_EDJ)$(EDJE_CC) $(EDJE_FLAGS) \
@ -39,15 +45,13 @@ black.edj: Makefile black.edc mild.edc default_colors.in.edc
$(top_srcdir)/data/themes/black.edc \
$(top_builddir)/data/themes/black.edj
solarized.edj: Makefile default.edc
solarized.edj: Makefile solarized.edc
$(AM_V_EDJ)$(EDJE_CC) $(EDJE_FLAGS) \
-DSOLARIZED=1 \
$(top_srcdir)/data/themes/default.edc \
$(top_builddir)/data/themes/solarized.edj
solarized_light.edj: Makefile default.edc
solarized_light.edj: Makefile solarized_light.edc
$(AM_V_EDJ)$(EDJE_CC) $(EDJE_FLAGS) \
-DSOLARIZED=1 -DSOLARIZED_LIGHT=1 \
$(top_srcdir)/data/themes/default.edc \
$(top_builddir)/data/themes/solarized_light.edj

View File

@ -1,41 +1,8 @@
#ifdef SOLARIZED
#define S_yellow 181 137 0 255
#define S_orange 203 75 22 255
#define S_red 220 50 47 255
#define S_magenta 211 54 130 255
#define S_violet 108 113 196 255
#define S_blue 38 139 210 255
#define S_cyan 42 161 152 255
#define S_green 133 153 0 255
#ifndef SOLARIZED_LIGHT
/* Dark */
#define S_base03 0 43 54 255
#define S_base02 7 54 66 255
#define S_base01 88 110 117 255
#define S_base00 101 123 131 255
#define S_base0 131 148 150 255
#define S_base0_shine 141 148 150 128
#define S_base1 147 161 161 255
#define S_base2 238 232 213 255
#define S_base3 253 246 227 255
#else
/* Light */
#define S_base03 253 246 227 255
#define S_base02 238 232 213 255
#define S_base01 147 161 161 255
#define S_base00 131 148 150 255
#define S_base0 101 123 131 255
#define S_base0_shine 111 123 131 128
#define S_base1 88 110 117 255
#define S_base2 7 54 66 255
#define S_base3 0 43 54 255
#endif
#ifndef NO_COLORS
color_classes {
# include "default_colors.in.edc"
# define BG_COL 32 32 32 255
}
#endif
collections {
@ -120,60 +87,6 @@ collections {
//// the background and general container for the terminal
group { name: "terminology/background";
#ifdef SOLARIZED
color_classes {
color_class { name: "c0"; color: S_base0; }
color_class { name: "c1"; color: S_base02; }
color_class { name: "c2"; color: S_red; }
color_class { name: "c3"; color: S_green; }
color_class { name: "c4"; color: S_yellow; }
color_class { name: "c5"; color: S_blue; }
color_class { name: "c6"; color: S_magenta; }
color_class { name: "c7"; color: S_cyan; }
color_class { name: "c8"; color: S_base2; }
color_class { name: "c11"; color: S_base0; }
color_class { name: "c13"; color: S_base03; }
color_class { name: "c14"; color: S_orange; }
color_class { name: "c15"; color: S_base01; }
color_class { name: "c16"; color: S_base00; }
color_class { name: "c17"; color: S_base0; }
color_class { name: "c18"; color: S_violet; }
color_class { name: "c19"; color: S_base1; }
color_class { name: "c20"; color: S_base3; }
color_class { name: "c25"; color: S_base03; }
color_class { name: "c26"; color: S_orange; }
color_class { name: "c27"; color: S_base01; }
color_class { name: "c28"; color: S_base00; }
color_class { name: "c29"; color: S_base0; }
color_class { name: "c30"; color: S_violet; }
color_class { name: "c31"; color: S_base1; }
color_class { name: "c32"; color: S_base3; }
color_class { name: "C0"; color: S_base02; } // COL_BLACK
color_class { name: "C1"; color: S_red; } // COL_RED
color_class { name: "C2"; color: S_green; } // COL_GREEN
color_class { name: "C3"; color: S_yellow; } // COL_YELLOW
color_class { name: "C4"; color: S_blue; } // COL_BLUE
color_class { name: "C5"; color: S_magenta; } // COL_MAGENTA
color_class { name: "C6"; color: S_cyan; } // COL_CYAN
color_class { name: "C7"; color: S_base2; } // COL_WHITE
color_class { name: "C8"; color: S_base03; } // COL_BLACK
color_class { name: "C9"; color: S_orange; } // COL_RED
color_class { name: "C10"; color: S_base01; } // COL_GREEN
color_class { name: "C11"; color: S_base00; } // COL_YELLOW
color_class { name: "C12"; color: S_base0; } // COL_BLUE
color_class { name: "C13"; color: S_violet; } // COL_MAGENTA
color_class { name: "C14"; color: S_base1; } // COL_CYAN
color_class { name: "C15"; color: S_base3; } // COL_WHITE
}
#else
color_classes {
#include "default_colors.in.edc"
}
#endif
images {
image: "bg_bevel.png" COMP;
image: "bg_shine.png" COMP;
@ -216,14 +129,10 @@ collections {
part { name: "base"; type: RECT;
mouse_events: 1;
description { state: "default" 0.0;
#ifdef SOLARIZED
color: S_base03;
#else
color: 32 32 32 255;
#endif
}
description { state: "translucent" 0.0;
inherit: "default" 0.0;
color: BG_COL;
}
description { state: "translucent" 0.0;
inherit: "default" 0.0;
visible: 0;
}
}

69
data/themes/solarized.edc Normal file
View File

@ -0,0 +1,69 @@
#define S_yellow 181 137 0 255
#define S_orange 203 75 22 255
#define S_red 220 50 47 255
#define S_magenta 211 54 130 255
#define S_violet 108 113 196 255
#define S_blue 38 139 210 255
#define S_cyan 42 161 152 255
#define S_green 133 153 0 255
#define S_base03 253 246 227 255
#define S_base02 238 232 213 255
#define S_base01 147 161 161 255
#define S_base00 131 148 150 255
#define S_base0 101 123 131 255
#define S_base1 88 110 117 255
#define S_base2 7 54 66 255
#define S_base3 0 43 54 255
#define BG_COL S_base03
#define NO_COLORS 1
color_classes {
color_class { name: "c0"; color: S_base0; }
color_class { name: "c1"; color: S_base02; }
color_class { name: "c2"; color: S_red; }
color_class { name: "c3"; color: S_green; }
color_class { name: "c4"; color: S_yellow; }
color_class { name: "c5"; color: S_blue; }
color_class { name: "c6"; color: S_magenta; }
color_class { name: "c7"; color: S_cyan; }
color_class { name: "c8"; color: S_base2; }
color_class { name: "c11"; color: S_base0; }
color_class { name: "c13"; color: S_base03; }
color_class { name: "c14"; color: S_orange; }
color_class { name: "c15"; color: S_base01; }
color_class { name: "c16"; color: S_base00; }
color_class { name: "c17"; color: S_base0; }
color_class { name: "c18"; color: S_violet; }
color_class { name: "c19"; color: S_base1; }
color_class { name: "c20"; color: S_base3; }
color_class { name: "c25"; color: S_base03; }
color_class { name: "c26"; color: S_orange; }
color_class { name: "c27"; color: S_base01; }
color_class { name: "c28"; color: S_base00; }
color_class { name: "c29"; color: S_base0; }
color_class { name: "c30"; color: S_violet; }
color_class { name: "c31"; color: S_base1; }
color_class { name: "c32"; color: S_base3; }
color_class { name: "C0"; color: S_base02; } // COL_BLACK
color_class { name: "C1"; color: S_red; } // COL_RED
color_class { name: "C2"; color: S_green; } // COL_GREEN
color_class { name: "C3"; color: S_yellow; } // COL_YELLOW
color_class { name: "C4"; color: S_blue; } // COL_BLUE
color_class { name: "C5"; color: S_magenta; } // COL_MAGENTA
color_class { name: "C6"; color: S_cyan; } // COL_CYAN
color_class { name: "C7"; color: S_base2; } // COL_WHITE
color_class { name: "C8"; color: S_base03; } // COL_BLACK
color_class { name: "C9"; color: S_orange; } // COL_RED
color_class { name: "C10"; color: S_base01; } // COL_GREEN
color_class { name: "C11"; color: S_base00; } // COL_YELLOW
color_class { name: "C12"; color: S_base0; } // COL_BLUE
color_class { name: "C13"; color: S_violet; } // COL_MAGENTA
color_class { name: "C14"; color: S_base1; } // COL_CYAN
color_class { name: "C15"; color: S_base3; } // COL_WHITE
}
#include "default.edc"

View File

@ -0,0 +1,69 @@
#define S_yellow 181 137 0 255
#define S_orange 203 75 22 255
#define S_red 220 50 47 255
#define S_magenta 211 54 130 255
#define S_violet 108 113 196 255
#define S_blue 38 139 210 255
#define S_cyan 42 161 152 255
#define S_green 133 153 0 255
#define S_base03 253 246 227 255
#define S_base02 238 232 213 255
#define S_base01 147 161 161 255
#define S_base00 131 148 150 255
#define S_base0 101 123 131 255
#define S_base1 88 110 117 255
#define S_base2 7 54 66 255
#define S_base3 0 43 54 255
#define BG_COL S_base03
#define NO_COLORS 1
color_classes {
color_class { name: "c0"; color: S_base0; }
color_class { name: "c1"; color: S_base02; }
color_class { name: "c2"; color: S_red; }
color_class { name: "c3"; color: S_green; }
color_class { name: "c4"; color: S_yellow; }
color_class { name: "c5"; color: S_blue; }
color_class { name: "c6"; color: S_magenta; }
color_class { name: "c7"; color: S_cyan; }
color_class { name: "c8"; color: S_base2; }
color_class { name: "c11"; color: S_base0; }
color_class { name: "c13"; color: S_base03; }
color_class { name: "c14"; color: S_orange; }
color_class { name: "c15"; color: S_base01; }
color_class { name: "c16"; color: S_base00; }
color_class { name: "c17"; color: S_base0; }
color_class { name: "c18"; color: S_violet; }
color_class { name: "c19"; color: S_base1; }
color_class { name: "c20"; color: S_base3; }
color_class { name: "c25"; color: S_base03; }
color_class { name: "c26"; color: S_orange; }
color_class { name: "c27"; color: S_base01; }
color_class { name: "c28"; color: S_base00; }
color_class { name: "c29"; color: S_base0; }
color_class { name: "c30"; color: S_violet; }
color_class { name: "c31"; color: S_base1; }
color_class { name: "c32"; color: S_base3; }
color_class { name: "C0"; color: S_base02; } // COL_BLACK
color_class { name: "C1"; color: S_red; } // COL_RED
color_class { name: "C2"; color: S_green; } // COL_GREEN
color_class { name: "C3"; color: S_yellow; } // COL_YELLOW
color_class { name: "C4"; color: S_blue; } // COL_BLUE
color_class { name: "C5"; color: S_magenta; } // COL_MAGENTA
color_class { name: "C6"; color: S_cyan; } // COL_CYAN
color_class { name: "C7"; color: S_base2; } // COL_WHITE
color_class { name: "C8"; color: S_base03; } // COL_BLACK
color_class { name: "C9"; color: S_orange; } // COL_RED
color_class { name: "C10"; color: S_base01; } // COL_GREEN
color_class { name: "C11"; color: S_base00; } // COL_YELLOW
color_class { name: "C12"; color: S_base0; } // COL_BLUE
color_class { name: "C13"; color: S_violet; } // COL_MAGENTA
color_class { name: "C14"; color: S_base1; } // COL_CYAN
color_class { name: "C15"; color: S_base3; } // COL_WHITE
}
#include "default.edc"