From: Jeonghyun Yun Date: Thu, 8 Sep 2011 06:28:25 +0000 (-0400) Subject: TEXTBLOCK 2text.8 style added X-Git-Tag: submit/2.0alpha-wayland/20121130.000903~568 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bcd35eb2ceb3c00e02e6f5fb6952baf8036d1838;p=profile%2Fivi%2Fefl-theme-tizen.git TEXTBLOCK 2text.8 style added Change-Id: Ie54e3a1f6244d2605285636a81ac51c739c489ac --- diff --git a/themes/groups/genlist/genlist_styles.edc b/themes/groups/genlist/genlist_styles.edc index 6f4a5b8..5e9217d 100644 --- a/themes/groups/genlist/genlist_styles.edc +++ b/themes/groups/genlist/genlist_styles.edc @@ -412,9 +412,11 @@ styles { style { name: "genlist_default_textblock_style"; base: "font=SLP:style=Roman font_size="GENLIST_FONT_STYLE_28_INC" color="GENLIST_PART_MULTILINE_TEXT_STYLE_COLOR_INC" text_class=list_item ellipsis=1.0"; + tag: "match" GENLIST_PART_MATCH_TAG_COLOR_INC; } style { name: "genlist_default_textblock_selected_style"; base: "font=SLP:style=Roman font_size="GENLIST_FONT_STYLE_28_INC" color="GENLIST_PART_MULTILINE_TEXT_STYLE_SELECTED_COLOR_INC" text_class=list_item ellipsis=1.0"; + tag: "match" GENLIST_PART_MATCH_TAG_COLOR_INC; } } parts { @@ -3274,6 +3276,137 @@ } } + group { name: "elm/genlist/item/2text.8/default"; + alias: "elm/genlist/item_odd/2text.8/default"; + alias: "elm/genlist/item_compress/2text.8/default"; + alias: "elm/genlist/item_compress_odd/2text.8/default"; + data.item: "stacking" "above"; + data.item: "selectraise" "on"; + data.item: "labels" "elm.text.1 elm.text.2"; + data.item: "renames" "elm.edit.rename"; + images { + image: "00_list_bar_press_1x80.png" COMP; + } + styles { + style { name: "genlist_sub_textblock_style"; + base: "font=SLP:style=Medium font_size="GENLIST_FONT_STYLE_20_INC" color="GENLIST_PART_MULTILINE_SUB_TEXT_STYLE_COLOR_INC" text_class=list_item ellipsis=1.0"; + tag: "match" GENLIST_PART_MATCH_TAG_COLOR_INC; + } + style { name: "genlist_sub_textblock_selected_style"; + base: "font=SLP:style=Medium font_size="GENLIST_FONT_STYLE_20_INC" color="GENLIST_PART_MULTILINE_TEXT_STYLE_SELECTED_COLOR_INC" text_class=list_item ellipsis=1.0"; + tag: "match" GENLIST_PART_MATCH_TAG_COLOR_INC; + } + } + parts { + GENLIST_PART_BASE( GENLIST_HEIGHT_81_INC ) + GENLIST_PART_BG_IMAGE + GENLIST_PART_BOTTOM_LINE + GENLIST_PART_PADDING_TOP( GENLIST_PADDING_6_INC ) + GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_6_INC ) + GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_10_INC ) + GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_10_INC ) + part { name: "elm.text.1"; + clip_to: "disclip"; + type: TEXTBLOCK; + mouse_events: 0; + scale: 1; + description { state: "default" 0.0; + min: 0 GENLIST_SIZE_38_INC; + fixed: 0 1; + rel1 { + relative: 1.0 1.0; + to_x: "elm.padding.left"; + to_y: "elm.padding.top"; + } + rel2 { + relative: 0.0 1.0; + to_x: "elm.padding.right"; + to_y: "elm.padding.top"; + } + align: 0.0 0.0; + text { + style: "genlist_default_textblock_style"; + min: 0 1; + align: 0.0 0.5; + } + } + description { state: "selected" 0.0; + inherit: "default" 0.0; + text.style: "genlist_default_textblock_selected_style"; + } + GENLIST_DESCRIPTION_RENAME_ENABLED + } + part { name: "elm.text.2"; + clip_to: "disclip"; + type: TEXTBLOCK; + mouse_events: 0; + scale: 1; + description { state: "default" 0.0; + rel1 { + relative: 1.0 1.0; + to_x: "elm.padding.left"; + to_y: "elm.text.1"; + } + rel2 { + relative: 0.0 0.0; + to_x: "elm.padding.right"; + to_y: "elm.padding.bottom"; + } + align: 0.0 0.0; + text { + style: "genlist_sub_textblock_style"; + min: 0 1; + align: 0.0 0.5; + } + } + description { state: "selected" 0.0; + inherit: "default" 0.0; + text.style: "genlist_sub_textblock_selected_style"; + } + GENLIST_DESCRIPTION_RENAME_ENABLED + } + GENLIST_PART_RENAME + GENLIST_PART_DISCLIP + } + programs { + // signal: elm,state,%s,active + // a "check" item named %s went active + // signal: elm,state,%s,passive + // a "check" item named %s went passive + // default is passive + program { name: "go_active"; + signal: "elm,state,selected"; + source: "elm"; + action: STATE_SET "selected" 0.0; + target: "bg_image"; + target: "elm.text.1"; + target: "elm.text.2"; + } + program { name: "go_passive"; + signal: "elm,state,unselected"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "bg_image"; + target: "elm.text.1"; + target: "elm.text.2"; + transition: LINEAR 0.1; + } + program { name: "go_disabled"; + signal: "elm,state,disabled"; + source: "elm"; + action: STATE_SET "disabled" 0.0; + target: "disclip"; + } + program { name: "go_enabled"; + signal: "elm,state,enabled"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "disclip"; + } + GENLIST_PROGRAM_RENAME_2TEXT + } + } + group { name: "elm/genlist/item/2text.3/default"; alias: "elm/genlist/item_odd/2text.3/default"; alias: "elm/genlist/item_compress/2text.3/default"; diff --git a/themes/inc/nbeat-black-inc.edc b/themes/inc/nbeat-black-inc.edc index fde255e..c9d7257 100644 --- a/themes/inc/nbeat-black-inc.edc +++ b/themes/inc/nbeat-black-inc.edc @@ -177,8 +177,10 @@ #define GENLIST_PART_MULTILINE_TITLE_STYLE_COLOR_INC "#F9F9F9FF" #define GENLIST_PART_MULTILINE_TITLE_STYLE_SELECTED_COLOR_INC "#F9F9F9FF" #define GENLIST_PART_MULTILINE_TEXT_STYLE_COLOR_INC "#959595FF" +#define GENLIST_PART_MULTILINE_SUB_TEXT_STYLE_COLOR_INC "#646464" #define GENLIST_PART_MULTILINE_TEXT_STYLE_SELECTED_COLOR_INC "#959595FF" #define GENLIST_PART_MULTILINE_HELP_STYLE_COLOR_INC "#929292" +#define GENLIST_PART_MATCH_TAG_COLOR_INC "+ color=#3F8DAD" #define GENLIST_PART_SLIDE_TEXT_COLOR_INC 255 255 255 255 #define GENLIST_PART_BOTTOM_LINE_INC 68 68 68 255 #define GENLIST_PART_DIALOGUE_SUBTITLE_TEXT_COLOR_INC 102 102 102 255 diff --git a/themes/inc/nbeat-hd-inc.edc b/themes/inc/nbeat-hd-inc.edc index e829155..669b09e 100644 --- a/themes/inc/nbeat-hd-inc.edc +++ b/themes/inc/nbeat-hd-inc.edc @@ -179,8 +179,10 @@ #define GENLIST_PART_MULTILINE_TITLE_STYLE_COLOR_INC "#4E4E4EFF" #define GENLIST_PART_MULTILINE_TITLE_STYLE_SELECTED_COLOR_INC "#4E4E4EFF" #define GENLIST_PART_MULTILINE_TEXT_STYLE_COLOR_INC "#000000" +#define GENLIST_PART_MULTILINE_SUB_TEXT_STYLE_COLOR_INC "#6C6C6C" #define GENLIST_PART_MULTILINE_TEXT_STYLE_SELECTED_COLOR_INC "#FFFFFF" #define GENLIST_PART_MULTILINE_HELP_STYLE_COLOR_INC "#9c8e7d" +#define GENLIST_PART_MATCH_TAG_COLOR_INC "+ color=#31A1FF" #define GENLIST_PART_SLIDE_TEXT_COLOR_INC 255 255 255 255 #define GENLIST_PART_BOTTOM_LINE_INC 199 199 199 255 #define GENLIST_PART_DIALOGUE_SUBTITLE_TEXT_COLOR_INC 156 156 156 255 diff --git a/themes/inc/nbeat-inc.edc b/themes/inc/nbeat-inc.edc index fbea762..9ae3654 100644 --- a/themes/inc/nbeat-inc.edc +++ b/themes/inc/nbeat-inc.edc @@ -178,7 +178,9 @@ #define GENLIST_PART_MULTILINE_TITLE_STYLE_SELECTED_COLOR_INC "#4E4E4EFF" #define GENLIST_PART_MULTILINE_TEXT_STYLE_COLOR_INC "#000000" #define GENLIST_PART_MULTILINE_TEXT_STYLE_SELECTED_COLOR_INC "#FFFFFF" +#define GENLIST_PART_MULTILINE_SUB_TEXT_STYLE_COLOR_INC "#6C6C6C" #define GENLIST_PART_MULTILINE_HELP_STYLE_COLOR_INC "#9c8e7d" +#define GENLIST_PART_MATCH_TAG_COLOR_INC "+ color=#31A1FF" #define GENLIST_PART_SLIDE_TEXT_COLOR_INC 255 255 255 255 #define GENLIST_PART_BOTTOM_LINE_INC 199 199 199 255 #define GENLIST_PART_DIALOGUE_SUBTITLE_TEXT_COLOR_INC 156 156 156 255