cedric pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=fd142aa2fbd8b9f5a09c571ca91772142de1190e

commit fd142aa2fbd8b9f5a09c571ca91772142de1190e
Author: Youngbok Shin <youngb.s...@samsung.com>
Date:   Mon Jan 4 14:34:06 2016 -0800

    calendar: add color classes and text classes.
    
    Summary:
    The following new color classes and text classes
    for calendar widget are added.
    "calendar_year_text"         - Year Text in Title Area
    "calendar_month_text"        - Month Text in Title Area
    "calendar_weekday_text"      - Weekday Text
    "calendar_day_text"          - Day Text
    "calendar_day_text_holiday"  - Holiday Text
    "calendar_day_text_today"    - Today Text
    "calendar_day_text_disabled" - Disabled Day Text
    "calendar_day_selected"      - Selected Day Effect
    "calendar_day_highlighted"   - Highlighted Day Effect
    "calendar_day_checked"       - Checked Day Effect
    @feature
    
    Test Plan: N/A
    
    Reviewers: woohyun, raster, cedric, kimcinoo, jaehwan
    
    Subscribers: CHAN
    
    Differential Revision: https://phab.enlightenment.org/D3482
    
    Signed-off-by: Cedric BAIL <ced...@osg.samsung.com>
---
 data/themes/colorclasses.edc     | 32 ++++++++++++++++++++++++++++++++
 data/themes/edc/elm/calendar.edc | 24 +++++++++++++++---------
 src/lib/elm_config.c             | 17 +++++++++++++++++
 3 files changed, 64 insertions(+), 9 deletions(-)

diff --git a/data/themes/colorclasses.edc b/data/themes/colorclasses.edc
index 9cc9b9b..3d61f8a 100644
--- a/data/themes/colorclasses.edc
+++ b/data/themes/colorclasses.edc
@@ -110,6 +110,38 @@ color_classes {
       color: FN_COL_HIGHLIGHT_DISABLE;
       desc: "Text of a disabled anchor link";
    }
+   color_class { name: "calendar_year_text";
+      color: FN_COL_DEFAULT;
+      desc: "Year Text in Title Area";
+   }
+   color_class { name: "calendar_month_text";
+      color: FN_COL_DEFAULT;
+      desc: "Month Text in Title Area";
+   }
+   color_class { name: "calendar_weekday_text";
+      color: FN_COL_DISABLE;
+      desc: "Weekday Text";
+   }
+   color_class { name: "calendar_day_text";
+      color: 255 255 255 255;
+      color3: 0 0 0 128;
+      desc: "Day Text";
+   }
+   color_class { name: "calendar_day_text_holiday";
+      color: 128 128 128 255;
+      color3: 0 0 0 128;
+      desc: "Holiday Text";
+   }
+   color_class { name: "calendar_day_text_today";
+      color: 51 153 255 255;
+      color2: 51 153 255 24;
+      desc: "Today Text";
+   }
+   color_class { name: "calendar_day_text_disabled";
+      color: 21 21 21 255;
+      color3: 255 255 255 192;
+      desc: "Disabled Day Text";
+   }
    color_class { name: "check_text";
       color: FN_COL_DEFAULT;
       desc: "Text of a checkbox's label";
diff --git a/data/themes/edc/elm/calendar.edc b/data/themes/edc/elm/calendar.edc
index b706a82..5ba602a 100644
--- a/data/themes/edc/elm/calendar.edc
+++ b/data/themes/edc/elm/calendar.edc
@@ -1,15 +1,15 @@
 #define CIT_STYLES\
       style { name: "calendar_date_style";\
-         base: "font="FN" font_size=10 color=#ffffff style=shadow,bottom 
shadow_color=#00000080 align=center";\
+         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";\
       }\
       style { name: "calendar_date_holiday_style";\
-         base: "font="FN" font_size=10 color=#808080 style=shadow,bottom 
shadow_color=#00000080 align=center";\
+         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";\
       }\
       style { name: "calendar_date_today_style";\
-         base: "font="FN" font_size=10 color=#3399ff style=glow 
glow_color=#3399ff18 align=center";\
+         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";\
       }\
       style { name: "calendar_date_disabled_style";\
-         base: "font="FN" font_size=10 color=#151515 style=shadow_bottom 
shadow_color=#ffffffc0 align=center";\
+         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";\
       }\
 
 #define CAL_SPIN(_sufix, _text, _relative)\
@@ -83,10 +83,11 @@
             rel2 { relative: 0.0 1.0;\
                to: "right_bt"#_sufix;\
             }\
-            color: FN_COL_DEFAULT;\
             text { font: FNBD; size: 10;\
                min: 0 1;\
+               text_class: "calendar_"#_text; \
             }\
+            color_class: "calendar_"#_text; \
          }\
       }
 
@@ -110,11 +111,12 @@
       description { state: "default" 0.0; \
          rel1.to: "ch_"#_pos".base"; \
          rel2.to: "ch_"#_pos".base"; \
-         color: FN_COL_DISABLE;\
          text { font: FN; size: 8; \
             min: 1 1; \
             ellipsis: -1; \
+            text_class: "calendar_weekday_text"; \
          } \
+         color_class: "calendar_weekday_text"; \
       } \
    } \
    part { name: "ch_"#_pos".clipper"; type: RECT; \
@@ -155,6 +157,7 @@
          image.normal: "diagonal_stripes.png"; \
          color: 255 255 255 25; \
          TILED_PATTERN(240, 240) \
+         color_class: "calendar_day_selected"; \
          visible: 0; \
       } \
       description { state: "selected" 0.0; \
@@ -168,6 +171,7 @@
          rel2.to: "cit_"#_pos".rect"; \
          image.normal: "outline_glow.png"; \
          image.border: 4 4 4 4; \
+         color_class: "calendar_day_selected"; \
          visible: 0; \
       } \
       description { state: "selected" 0.0; \
@@ -181,11 +185,12 @@
          rel2.to: "cit_"#_pos".rect"; \
          image.normal: "outline_glow.png"; \
          image.border: 4 4 4 4; \
+         color: 255 255 255 128; \
+         color_class: "calendar_day_highlighted"; \
          visible: 0; \
       } \
-      description { state: "hilighted" 0.0; \
+      description { state: "highlighted" 0.0; \
          inherit: "default" 0.0; \
-         color: 255 255 255 128; \
          visible: 1; \
       } \
    } \
@@ -228,6 +233,7 @@
          aspect: 1 1; \
          align: 0.0 1.0;\
          image.normal: "icon_border_remember.png"; \
+         color_class: "calendar_day_checked"; \
          visible: 0; \
       } \
       description { state: "visible" 0.0; \
@@ -296,7 +302,7 @@
          source: "cit_"#_pos".clicked"; \
          signal: "mouse,down,1"; \
          source: "cit_"#_pos".event"; \
-         action:  STATE_SET "hilighted" 0.0; \
+         action:  STATE_SET "highlighted" 0.0; \
          target:  "cit_"#_pos".selected2"; \
       } \
       program { \
diff --git a/src/lib/elm_config.c b/src/lib/elm_config.c
index 7cbc2c7..beb144c 100644
--- a/src/lib/elm_config.c
+++ b/src/lib/elm_config.c
@@ -57,6 +57,13 @@ const char *_elm_engines[] = {
    declare it both here and in the (default) theme */
 static const Elm_Text_Class _elm_text_classes[] = {
    {"button", "Button"},
+   {"calendar_year_text", "Year Text in Title Area"},
+   {"calendar_month_text", "Month Text in Title Area"},
+   {"calendar_weekday_text", "Weekday Text"},
+   {"calendar_day_text", "Day Text"},
+   {"calendar_day_text_holiday", "Holiday Text"},
+   {"calendar_day_text_today", "Today Text"},
+   {"calendar_day_text_disabled", "Disabled Day Text"},
    {"label", "Label"},
    {"entry", "Entry"},
    {"title_bar", "Title Bar"},
@@ -74,6 +81,16 @@ static const Elm_Color_Class _elm_color_classes[] = {
    {"button_text_disabled", "Button Disabled Text"},
    {"button_text_anchor", "Anchor Button Text"},
    {"button_text_anchor_disabled", "Anchor Button Disabled Text"},
+   {"calendar_year_text", "Year Text in Title Area"},
+   {"calendar_month_text", "Month Text in Title Area"},
+   {"calendar_weekday_text", "Weekday Text"},
+   {"calendar_day_text", "Day Text"},
+   {"calendar_day_text_holiday", "Holiday Text"},
+   {"calendar_day_text_today", "Today Text"},
+   {"calendar_day_text_disabled", "Disabled Day Text"},
+   {"calendar_day_selected", "Selected Day Effect"},
+   {"calendar_day_highlighted", "Highlighted Day Effect"},
+   {"calendar_day_checked", "Checked Day Effect"},
    {"hoversel_item_active", "Hoversel Item Text"},
    {"hoversel_text_disabled", "Hoversel Item Disabled Text"},
    {"radio_text", "Radio Text"},

-- 


Reply via email to