From 1c312469d98a03d21879d6f54d46ada39f62aa2a Mon Sep 17 00:00:00 2001 From: Daniel Juyung Seo Date: Wed, 12 Oct 2011 18:08:40 +0900 Subject: [PATCH] [*][Genlist] Changed TEXT part to TEXTBLOCK part of elm.text.1 and elm.text.2 in 3text.6icon style. Applied email application's fix. Change-Id: I8b410f20aad496df784ac02d6160a93d152ff426 --- themes/groups/genlist/genlist.edc | 1 + themes/groups/genlist/genlist_styles.edc | 55 ++++++++++++-------- themes/groups/genlist/genlist_textblock_style.edc | 62 +++++++++++++++++++++++ themes/inc/nbeat-black-hd-inc.edc | 5 ++ themes/inc/nbeat-black-inc.edc | 5 ++ themes/inc/nbeat-hd-inc.edc | 5 ++ themes/inc/nbeat-inc.edc | 5 ++ 7 files changed, 116 insertions(+), 22 deletions(-) create mode 100644 themes/groups/genlist/genlist_textblock_style.edc diff --git a/themes/groups/genlist/genlist.edc b/themes/groups/genlist/genlist.edc index 50928da..3279422 100644 --- a/themes/groups/genlist/genlist.edc +++ b/themes/groups/genlist/genlist.edc @@ -26,6 +26,7 @@ */ #include "genlist_macro.edc" +#include "genlist_textblock_style.edc" #include "genlist_styles.edc" #include "genlist_sweep.edc" diff --git a/themes/groups/genlist/genlist_styles.edc b/themes/groups/genlist/genlist_styles.edc index 787ea2b..db2b4a6 100644 --- a/themes/groups/genlist/genlist_styles.edc +++ b/themes/groups/genlist/genlist_styles.edc @@ -7320,58 +7320,69 @@ visible: 0; } } - part { name: "elm.text.1"; + part { name: "elm.text1.rect"; clip_to: "disclip"; - type: TEXT; - mouse_events: 0; + type: RECT; scale: 1; description { state: "default" 0.0; min: 0 GENLIST_SIZE_38_INC; - fixed: 0 1; + fixed: 1 0; rel1 { relative: 1.0 1.0; - to_x: "elm.padding.left"; + to_x: "elm.swallow.colorbar"; to_y: "elm.padding.top"; } rel2 { - relative: 0.0 1.0; + relative: 0.0 0.0; to_x: "elm.padding.icon1.left"; to_y: "elm.padding.top"; } align: 0.0 0.0; - color: GENLIST_PART_TEXT_COLOR_INC; + visible: 0; + } + } + part { name: "elm.text.1"; + clip_to: "disclip"; + type: TEXTBLOCK; + mouse_events: 0; + scale: 1; + description { state: "default" 0.0; + fixed: 1 1; + rel1.to: "elm.text1.rect"; + rel2.to: "elm.text1.rect"; + align: 0.0 0.0; text { - font: "SLP:style=Roman"; - size: GENLIST_FONT_28_INC; + style: "genlist_email_textblock_style"; min: 0 1; + max: 0 1; align: 0.0 0.5; } } description { state: "selected" 0.0; inherit: "default" 0.0; - color: GENLIST_PART_TEXT_SELECTED_COLOR_INC; + text.style: "genlist_email_textblock_selected_style"; } description { state: "read" 0.0; inherit: "default" 0.0; - color: GENLIST_PART_EMAIL_READ_TEXT_COLOR_INC; + text.style: "genlist_email_textblock_read_style"; } description { state: "unread" 0.0; inherit: "default" 0.0; - color: GENLIST_PART_TEXT_COLOR_INC; + text.style: "genlist_email_textblock_unread_style"; } - description { state: "urgency_unread" 0.0; + description { state: "urgency_read" 0.0; inherit: "default" 0.0; - color: GENLIST_PART_EMAIL_URGENCY_UNREAD_TEXT_COLOR_INC; + text.style: "genlist_email_textblock_urgency_read_style"; } - description { state: "urgency_read" 0.0; + description { state: "urgency_unread" 0.0; inherit: "default" 0.0; - color: GENLIST_PART_EMAIL_URGENCY_READ_TEXT_COLOR_INC; + text.style: "genlist_email_textblock_urgency_unread_style"; } GENLIST_DESCRIPTION_RENAME_ENABLED } part { name: "elm.text.2"; clip_to: "disclip"; - type: TEXT; + type: TEXTBLOCK; scale: 1; description { state: "default" 0.0; fixed: 1 1; @@ -7386,17 +7397,15 @@ to_y: "elm.padding.bottom"; } align: 0.0 0.5; - color: GENLIST_PART_SUB_TEXT_COLOR_INC; text { - font: "SLP:style=Medium"; - size: GENLIST_FONT_20_INC; - min: 0 0; + style: "genlist_email_textblock2_style"; + min: 0 1; align: 0.0 0.5; } } description { state: "selected" 0.0; inherit: "default" 0.0; - color: GENLIST_PART_TEXT_SELECTED_COLOR_INC; + text.style: "genlist_email_textblock2_selected_style"; } GENLIST_DESCRIPTION_RENAME_ENABLED } @@ -7567,6 +7576,7 @@ source: "elm"; action: STATE_SET "selected" 0.0; target: "bg_image"; + target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3"; } @@ -7575,6 +7585,7 @@ source: "elm"; action: STATE_SET "default" 0.0; target: "bg_image"; + target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3"; transition: LINEAR 0.1; diff --git a/themes/groups/genlist/genlist_textblock_style.edc b/themes/groups/genlist/genlist_textblock_style.edc new file mode 100644 index 0000000..afc2c9a --- /dev/null +++ b/themes/groups/genlist/genlist_textblock_style.edc @@ -0,0 +1,62 @@ +/* + * nbeat-theme + * + * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. + * + * Contact: Seokjae Jeong , Myoungwoon Roy Kim , Jeonghyun Yun , Jaehwan Kim , Chuneon Park , Juyung Seo , Woohyun Jung , Myungjae Lee , Hyoyoung Chang , IlKook Yun , CinWoo Kim JiYeon Park + * + * This library is free software; you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation; either version 2.1 of the License, or (at your option) + * any later version. + * + * This library is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, write to the Free Software Foundation, Inc., 51 + * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + */ + +/* + * vim:ts=3 +*/ + + +styles { + style { name: "genlist_email_textblock_style"; + base: "font=SLP:style=Roman font_size="GENLIST_FONT_28_INC" color="GENLIST_PART_TEXTBLOCK_STYLE_COLOR_INC" text_class=list_item ellipsis=1.0"; + tag: "match" GENLIST_PART_MATCH_TAG_COLOR_INC; + } + style { name: "genlist_email_textblock_selected_style"; + base: "font=SLP:style=Roman font_size="GENLIST_FONT_28_INC" color="GENLIST_PART_TEXTBLOCK_STYLE_SELECTED_COLOR_INC" text_class=list_item ellipsis=1.0"; + tag: "match" GENLIST_PART_MATCH_TAG_COLOR_INC; + } + style { name: "genlist_email_textblock_read_style"; + base: "font=SLP:style=Roman font_size="GENLIST_FONT_28_INC" color="GENLIST_PART_TEXTBLOCK_SUB_STYLE_COLOR_INC" text_class=list_item ellipsis=1.0"; + tag: "match" GENLIST_PART_MATCH_TAG_COLOR_INC; + } + style { name: "genlist_email_textblock_unread_style"; + base: "font=SLP:style=Roman font_size="GENLIST_FONT_28_INC" color="GENLIST_PART_TEXTBLOCK_STYLE_COLOR_INC" text_class=list_item ellipsis=1.0"; + tag: "match" GENLIST_PART_MATCH_TAG_COLOR_INC; + } + style { name: "genlist_email_textblock_urgency_unread_style"; + base: "font=SLP:style=Roman font_size="GENLIST_FONT_28_INC" color="GENLIST_PART_TEXTBLOCK_URGENCY_UNREAD_STYLE_COLOR_INC" text_class=list_item ellipsis=1.0"; + tag: "match" GENLIST_PART_MATCH_TAG_COLOR_INC; + } + style { name: "genlist_email_textblock_urgency_read_style"; + base: "font=SLP:style=Roman font_size="GENLIST_FONT_28_INC" color="GENLIST_PART_TEXTBLOCK_URGENCY_READ_STYLE_COLOR_INC" text_class=list_item ellipsis=1.0"; + tag: "match" GENLIST_PART_MATCH_TAG_COLOR_INC; + } + style { name: "genlist_email_textblock2_style"; + base: "font=SLP:style=Medium font_size="GENLIST_FONT_20_INC" color="GENLIST_PART_TEXTBLOCK_STYLE_COLOR_INC" text_class=list_item ellipsis=1.0"; + tag: "match" GENLIST_PART_MATCH_TAG_COLOR_INC; + } + style { name: "genlist_email_textblock2_selected_style"; + base: "font=SLP:style=Medium font_size="GENLIST_FONT_20_INC" color="GENLIST_PART_TEXTBLOCK_STYLE_SELECTED_COLOR_INC" text_class=list_item ellipsis=1.0"; + tag: "match" GENLIST_PART_MATCH_TAG_COLOR_INC; + } +} diff --git a/themes/inc/nbeat-black-hd-inc.edc b/themes/inc/nbeat-black-hd-inc.edc index 6f0f1ca..75d2a4e 100644 --- a/themes/inc/nbeat-black-hd-inc.edc +++ b/themes/inc/nbeat-black-hd-inc.edc @@ -230,6 +230,11 @@ #define GENLIST_PART_EMAIL_URGENCY_UNREAD_TEXT_COLOR_INC 207 37 37 255 #define GENLIST_PART_EMAIL_URGENCY_READ_TEXT_COLOR_INC 171 82 82 255 #define GENLIST_PART_EMAIL_MSGCOUNT_TEXT_COLOR_INC 255 255 255 255 +#define GENLIST_PART_TEXTBLOCK_STYLE_COLOR_INC "#646464FF" +#define GENLIST_PART_TEXTBLOCK_STYLE_SELECTED_COLOR_INC "#959595" +#define GENLIST_PART_TEXTBLOCK_SUB_STYLE_COLOR_INC "#646464" +#define GENLIST_PART_TEXTBLOCK_URGENCY_READ_STYLE_COLOR_INC "#AB5252" +#define GENLIST_PART_TEXTBLOCK_URGENCY_UNREAD_STYLE_COLOR_INC "#CF2525" #define GENLIST_GROUP_PART_TEXT_COLOR_INC 57 166 215 255 #define GENLIST_GROUP_PART_BASE_EVENT_INC \ part { name: "base_event";\ diff --git a/themes/inc/nbeat-black-inc.edc b/themes/inc/nbeat-black-inc.edc index d4084ec..13f539c 100644 --- a/themes/inc/nbeat-black-inc.edc +++ b/themes/inc/nbeat-black-inc.edc @@ -227,6 +227,11 @@ #define GENLIST_PART_EMAIL_URGENCY_UNREAD_TEXT_COLOR_INC 207 37 37 255 #define GENLIST_PART_EMAIL_URGENCY_READ_TEXT_COLOR_INC 171 82 82 255 #define GENLIST_PART_EMAIL_MSGCOUNT_TEXT_COLOR_INC 255 255 255 255 +#define GENLIST_PART_TEXTBLOCK_STYLE_COLOR_INC "#646464FF" +#define GENLIST_PART_TEXTBLOCK_STYLE_SELECTED_COLOR_INC "#959595" +#define GENLIST_PART_TEXTBLOCK_SUB_STYLE_COLOR_INC "#646464" +#define GENLIST_PART_TEXTBLOCK_URGENCY_READ_STYLE_COLOR_INC "#AB5252" +#define GENLIST_PART_TEXTBLOCK_URGENCY_UNREAD_STYLE_COLOR_INC "#CF2525" #define GENLIST_GROUP_PART_TEXT_COLOR_INC 57 166 215 255 #define GENLIST_GROUP_PART_BASE_EVENT_INC \ part { name: "base_event";\ diff --git a/themes/inc/nbeat-hd-inc.edc b/themes/inc/nbeat-hd-inc.edc index b19fff2..db194c2 100644 --- a/themes/inc/nbeat-hd-inc.edc +++ b/themes/inc/nbeat-hd-inc.edc @@ -229,6 +229,11 @@ #define GENLIST_PART_EMAIL_URGENCY_UNREAD_TEXT_COLOR_INC 207 37 37 255 #define GENLIST_PART_EMAIL_URGENCY_READ_TEXT_COLOR_INC 171 82 82 255 #define GENLIST_PART_EMAIL_MSGCOUNT_TEXT_COLOR_INC 255 255 255 255 +#define GENLIST_PART_TEXTBLOCK_STYLE_COLOR_INC "#000000FF" +#define GENLIST_PART_TEXTBLOCK_STYLE_SELECTED_COLOR_INC "#FFFFFF" +#define GENLIST_PART_TEXTBLOCK_SUB_STYLE_COLOR_INC "#6C6C6C" +#define GENLIST_PART_TEXTBLOCK_URGENCY_READ_STYLE_COLOR_INC "#AB5252" +#define GENLIST_PART_TEXTBLOCK_URGENCY_UNREAD_STYLE_COLOR_INC "#CF2525" #define GENLIST_GROUP_PART_TEXT_COLOR_INC 108 108 108 255 #define GENLIST_GROUP_PART_BASE_EVENT_INC \ part { name: "base_event";\ diff --git a/themes/inc/nbeat-inc.edc b/themes/inc/nbeat-inc.edc index dbf8d09..3aeeaca 100644 --- a/themes/inc/nbeat-inc.edc +++ b/themes/inc/nbeat-inc.edc @@ -227,6 +227,11 @@ #define GENLIST_PART_EMAIL_URGENCY_UNREAD_TEXT_COLOR_INC 207 37 37 255 #define GENLIST_PART_EMAIL_URGENCY_READ_TEXT_COLOR_INC 171 82 82 255 #define GENLIST_PART_EMAIL_MSGCOUNT_TEXT_COLOR_INC 255 255 255 255 +#define GENLIST_PART_TEXTBLOCK_STYLE_COLOR_INC "#000000FF" +#define GENLIST_PART_TEXTBLOCK_STYLE_SELECTED_COLOR_INC "#FFFFFF" +#define GENLIST_PART_TEXTBLOCK_SUB_STYLE_COLOR_INC "#6C6C6C" +#define GENLIST_PART_TEXTBLOCK_URGENCY_READ_STYLE_COLOR_INC "#AB5252" +#define GENLIST_PART_TEXTBLOCK_URGENCY_UNREAD_STYLE_COLOR_INC "#CF2525" #define GENLIST_GROUP_PART_TEXT_COLOR_INC 108 108 108 255 #define GENLIST_GROUP_PART_BASE_EVENT_INC \ part { name: "base_event";\ -- 2.7.4