entry: add new text classes and color classes for Entry widget

Summary:
Add new text classes and color classes for Entry widget according to
consistency with other widget's class.
And it removes legacy classes. If we need to support backward
compatibility, the legacy classes have to be maintained in each widget.

Test Plan: N/A

Reviewers: cedric, woohyun, jaehwan, kimcinoo, raster

Subscribers: CHAN

Differential Revision: https://phab.enlightenment.org/D3486

Signed-off-by: Cedric BAIL <cedric@osg.samsung.com>

3 files changed, 38 insertions, 20 deletions

diff --git a/data/themes/colorclasses.edc b/data/themes/colorclasses.edc
index 5f92a14cb..d62534475 100644
--- a/data/themes/colorclasses.edc
+++ b/data/themes/colorclasses.edc
@@ -179,13 +179,22 @@ color_classes {
       desc: "Text in a disabled datetime separator area";
    }
    color_class { name: "entry_text";
-      color: FN_COL_DEFAULT_BASIC;
+      color: FN_COL_DEFAULT;
       desc: "Text in an entry box";
    }
    color_class { name: "entry_text_disabled";
-      color: FN_COL_DEFAULT_BASIC;
+      color: FN_COL_DISABLE;
       desc: "Text in a disabled entry box";
    }
+   color_class { name: "entry_guide_text";
+      color: 0 0 0 255;
+      color3: 255 255 255 25;
+      desc: "Guide Text in a entry box";
+   }
+   color_class { name: "entry_scrollframe_base";
+      color: DARK_GREY_BG_COLOR;
+      desc: "Base of a entry's scroller widget";
+   }
    color_class { name: "label_text";
       color: FN_COL_DEFAULT;
       desc: "Text of a generic label";
diff --git a/data/themes/edc/elm/entry.edc b/data/themes/edc/elm/entry.edc
index 390a9552e..7214080f2 100644
--- a/data/themes/edc/elm/entry.edc
+++ b/data/themes/edc/elm/entry.edc
@@ -214,8 +214,7 @@ group { name: "elm/scroller/entry_single/default";
          description { state: "default" 0.0;
             rel1.to: "elm.swallow.background";
             rel2.to: "elm.swallow.background";
-            color: DARK_GREY_BG_COLOR;
-            color_class: "scrollframe_base";
+            color_class: "entry_scrollframe_base";
          }
       }
       part { name: "clipper"; type: RECT;
@@ -395,6 +394,7 @@ group { name: "elm/entry/cursor/default";
             image.border: 4 4 4 4;
             fill.smooth: 0;
             color: 255 255 255 0;
+            color_class: "entry_cursor";
             min: 9 10;
          }
          description { state: "visible" 0.0;
@@ -530,23 +530,23 @@ group { name: "elm/entry/base/default";
    
    styles {
       style { name: "entry_style";
-         base: "font="FN" font_size=10 color=#ffffff style=shadow,bottom shadow_color=#00000080 wrap=word text_class=entry color_class=entry left_margin=2 right_margin=2";
+         base: "font="FN" font_size=10 color=#ffffff style=shadow,bottom shadow_color=#00000080 wrap=word text_class=entry_text color_class=entry_text left_margin=2 right_margin=2";
          ENABLED_TEXTBLOCK_TAGS
       }
       style { name: "entry_nowrap_style";
-         base: "font="FN" font_size=10 color=#ffffff style=shadow,bottom shadow_color=#00000080 text_class=entry color_class=entry left_margin=2 right_margin=2";
+         base: "font="FN" font_size=10 color=#ffffff style=shadow,bottom shadow_color=#00000080 text_class=entry_text color_class=entry_text left_margin=2 right_margin=2";
          ENABLED_TEXTBLOCK_TAGS
       }
       style { name: "entry_disabled_style";
-         base: "font="FN" font_size=10 color=#151515 style=shadow,bottom shadow_color=#ffffff19 wrap=word text_class=entry color_class=entry_disabled left_margin=2 right_margin=2";
+         base: "font="FN" font_size=10 color=#151515 style=shadow,bottom shadow_color=#ffffff19 wrap=word text_class=entry_text_disabled color_class=entry_text_disabled left_margin=2 right_margin=2";
          DISABLED_TEXTBLOCK_TAGS
       }
       style { name: "entry_nowrap_disabled_style";
-         base: "font="FN" font_size=10 color=#151515 style=shadow,bottom shadow_color=#ffffff19 text_class=entry color_class=entry_disabled left_margin=2 right_margin=2";
+         base: "font="FN" font_size=10 color=#151515 style=shadow,bottom shadow_color=#ffffff19 text_class=entry_text_disabled color_class=entry_text_disabled left_margin=2 right_margin=2";
          DISABLED_TEXTBLOCK_TAGS
       }
       style { name: "entry_guide_style";
-         base: "font="FN" font_size=10 color=#000000 style=shadow,bottom shadow_color=#ffffff19 wrap=word text_class=entry color_class=entry_guide left_margin=2 right_margin=2 ellipsis=0.0";
+         base: "font="FN" font_size=10 color=#000000 style=shadow,bottom shadow_color=#ffffff19 wrap=word text_class=entry_guide_text color_class=entry_guide_text left_margin=2 right_margin=2 ellipsis=0.0";
          DISABLED_TEXTBLOCK_TAGS
       }
    }
@@ -654,15 +654,15 @@ group { name: "elm/entry/base-mixedwrap/default";
    inherit: "elm/entry/base/default";
    styles {
       style { name: "entry_style_mixedwrap";
-         base: "font="FN" font_size=10 color=#ffffff style=shadow,bottom shadow_color=#00000080 wrap=mixed text_class=entry color_class=entry left_margin=2 right_margin=2";
+         base: "font="FN" font_size=10 color=#ffffff style=shadow,bottom shadow_color=#00000080 wrap=mixed text_class=entry_text color_class=entry_text left_margin=2 right_margin=2";
          ENABLED_TEXTBLOCK_TAGS
       }
       style { name: "entry_disabled_style_mixedwrap";
-         base: "font="FN" font_size=10 color=#151515 style=shadow,bottom shadow_color=#ffffff19 wrap=mixed text_class=entry color_class=entry_disabled left_margin=2 right_margin=2";
+         base: "font="FN" font_size=10 color=#151515 style=shadow,bottom shadow_color=#ffffff19 wrap=mixed text_class=entry_text_disabled color_class=entry_text_disabled left_margin=2 right_margin=2";
          DISABLED_TEXTBLOCK_TAGS
       }
       style { name: "entry_guide_style_mixedwrap";
-         base: "font="FN" font_size=10 color=#000000 style=shadow,bottom shadow_color=#ffffff19 wrap=mixed text_class=entry color_class=entry_guide left_margin=2 right_margin=2 ellipsis=0.0";
+         base: "font="FN" font_size=10 color=#000000 style=shadow,bottom shadow_color=#ffffff19 wrap=mixed text_class=entry_guide_text color_class=entry_guide_text left_margin=2 right_margin=2 ellipsis=0.0";
          DISABLED_TEXTBLOCK_TAGS
       }
    }
@@ -704,15 +704,15 @@ group { name: "elm/entry/base-charwrap/default";
    inherit: "elm/entry/base/default";
    styles {
       style { name: "entry_style_charwrap";
-         base: "font="FN" font_size=10 color=#ffffff style=shadow,bottom shadow_color=#00000080 wrap=char text_class=entry color_class=entry left_margin=2 right_margin=2";
+         base: "font="FN" font_size=10 color=#ffffff style=shadow,bottom shadow_color=#00000080 wrap=char text_class=entry_text color_class=entry_text left_margin=2 right_margin=2";
          ENABLED_TEXTBLOCK_TAGS
       }
       style { name: "entry_disabled_style_charwrap";
-         base: "font="FN" font_size=10 color=#151515 style=shadow,bottom shadow_color=#ffffff19 wrap=char text_class=entry color_class=entry_disabled left_margin=2 right_margin=2";
+         base: "font="FN" font_size=10 color=#151515 style=shadow,bottom shadow_color=#ffffff19 wrap=char text_class=entry_text_disabled color_class=entry_text_disabled left_margin=2 right_margin=2";
          DISABLED_TEXTBLOCK_TAGS
       }
       style { name: "entry_guide_style_charwrap";
-         base: "font="FN" font_size=10 color=#000000 style=shadow,bottom shadow_color=#ffffff19 wrap=char text_class=entry color_class=entry_guide left_margin=2 right_margin=2 ellipsis=0.0";
+         base: "font="FN" font_size=10 color=#000000 style=shadow,bottom shadow_color=#ffffff19 wrap=char text_class=entry_guide_text color_class=entry_guide_text left_margin=2 right_margin=2 ellipsis=0.0";
          DISABLED_TEXTBLOCK_TAGS
       }
    }
@@ -790,15 +790,15 @@ group { name: "elm/entry/base-single/default";
    inherit: "elm/entry/base/default";
    styles {
       style { name: "entry_single_style";
-         base: "font="FN" font_size=10 color=#ffffff style=shadow,bottom shadow_color=#00000080 wrap=none text_class=entry color_class=entry left_margin=2 right_margin=2";
+         base: "font="FN" font_size=10 color=#ffffff style=shadow,bottom shadow_color=#00000080 wrap=none text_class=entry_text color_class=entry_text left_margin=2 right_margin=2";
          ENABLED_TEXTBLOCK_TAGS
       }
       style { name: "entry_single_disabled_style";
-         base: "font="FN" font_size=10 color=#151515 style=shadow,bottom shadow_color=#ffffff19 wrap=none text_class=entry color_class=entry_disabled left_margin=2 right_margin=2";
+         base: "font="FN" font_size=10 color=#151515 style=shadow,bottom shadow_color=#ffffff19 wrap=none text_class=entry_text_disabled color_class=entry_text_disabled left_margin=2 right_margin=2";
          DISABLED_TEXTBLOCK_TAGS
       }
       style { name: "entry_single_guide_style";
-         base: "font="FN" font_size=10 color=#000000 style=shadow,bottom shadow_color=#ffffff19 wrap=none text_class=entry color_class=entry_guide left_margin=2 right_margin=2 ellipsis=0.0";
+         base: "font="FN" font_size=10 color=#000000 style=shadow,bottom shadow_color=#ffffff19 wrap=none text_class=entry_guide_text color_class=entry_guide_text left_margin=2 right_margin=2 ellipsis=0.0";
          DISABLED_TEXTBLOCK_TAGS
       }
    }
@@ -1077,6 +1077,7 @@ group { name: "elm/entry/handler/start/default";
             min: 21 27; // 42 54
             image.normal: "handle_pick_up_left.png";
             align: (29/42) (11/54);
+            color_class: "entry_selection_handler";
             visible: 0;
          }
          description { state: "visible" 0.0;
@@ -1124,6 +1125,7 @@ group { name: "elm/entry/handler/end/default";
             min: 21 27; // 42 54
             image.normal: "handle_pick_up_right.png";
             align: (12/42) (11/54);
+            color_class: "entry_selection_handler";
             visible: 0;
          }
          description { state: "visible" 0.0;
diff --git a/src/lib/elm_config.c b/src/lib/elm_config.c
index 2618277d3..9e01f44fc 100644
--- a/src/lib/elm_config.c
+++ b/src/lib/elm_config.c
@@ -67,7 +67,9 @@ static const Elm_Text_Class _elm_text_classes[] = {
    {"datetime_separator_text", "Datetime Separator Text"},
    {"datetime_separator_text_disabled", "Datetime Separator Disabled Text"},
    {"label", "Label"},
-   {"entry", "Entry"},
+   {"entry_text", "Entry Text"},
+   {"entry_text_disabled", "Entry Disabled Text"},
+   {"entry_guide_text", "Entry Guide Text"},
    {"title_bar", "Title Bar"},
    {"list_item", "List Items"},
    {"grid_item", "Grid Items"},
@@ -100,7 +102,12 @@ static const Elm_Color_Class _elm_color_classes[] = {
    {"hoversel_text_disabled", "Hoversel Item Disabled Text"},
    {"radio_text", "Radio Text"},
    {"frame", "Frame Text"},
-   {"entry", "Entry Text"},
+   {"entry_text", "Entry Text"},
+   {"entry_text_disabled", "Entry Disabled Text"},
+   {"entry_guide_text", "Entry Guide Text"},
+   {"entry_cursor", "Entry Cursor"},
+   {"entry_selection_handler", "Entry Selection Handler"},
+   {"entry_scrollframe_base", "Entry Scrollframe Base"},
    {"check_text", "Check Text"},
    {"check_on_text", "Check On Text"},
    {"check_off_text", "Check Off Text"},