From eabcc40be7e5c0ba164b15cda32439b3449fd193 Mon Sep 17 00:00:00 2001 From: Naresh Pajjuri Date: Fri, 26 Apr 2013 15:41:18 +0530 Subject: [PATCH] 1. Changed the elm.icon.1 size to 64*64 in email genlist styles for correct handling of scrolling. 2. Changed text part names to match the tts guidelines --- themes/widgets/genlist/genlist_email.edc | 79 +++++++++++++++----------------- 1 file changed, 37 insertions(+), 42 deletions(-) diff --git a/themes/widgets/genlist/genlist_email.edc b/themes/widgets/genlist/genlist_email.edc index ba72047..edb942e 100644 --- a/themes/widgets/genlist/genlist_email.edc +++ b/themes/widgets/genlist/genlist_email.edc @@ -229,7 +229,15 @@ #define GENLIST_PART_PADDING_EMAIL_BOTTOM_TO_SIZE( NAME, SIZE ) \ GENLIST_PART_SPACER(NAME, \ - GENLIST_DESCRIPTION_LRT("elm.icon.2", "elm.text.4", "elm.text.3", \ + GENLIST_DESCRIPTION_LRT("elm.icon.2", "elm.text.5", "elm.text.2", \ + min: 0 SIZE; \ + fixed: 0 1; \ + ) \ + ) + +#define GENLIST_PART_PADDING_EMAIL_OUTBOX_BOTTOM_TO_SIZE( NAME, SIZE ) \ + GENLIST_PART_SPACER(NAME, \ + GENLIST_DESCRIPTION_LRT("elm.icon.2", "elm.icon.5", "elm.text.2", \ min: 0 SIZE; \ fixed: 0 1; \ ) \ @@ -328,8 +336,8 @@ // 2.2.3.5 (Email Style) group { GENLIST_NAME("email.list/default") GENLIST_PROLOG_NORMAL - data.item: "texts" "elm.text.1 elm.text.2 elm.text.3 elm.text.4"; - data.item: "contents" "elm.swallow.colorbar elm.icon.1 elm.icon.1.touch elm.icon.2 elm.icon.3 elm.icon.4 elm.icon.4.touch"; + data.item: "texts" "elm.text.1 elm.text.2 elm.text.3 elm.text.5"; + data.item: "contents" "elm.swallow.colorbar elm.icon.1 elm.icon.2 elm.icon.3 elm.icon.4 elm.icon.4.touch"; script { public readed = 0; @@ -344,13 +352,7 @@ GENLIST_PART_PADDING_BOTTOM_SIZE( GENLIST_EMAIL_PADDING_SIZE_BOTTOM_3LINE ) GENLIST_PART_COLORBAR - GENLIST_PART_ICON("elm.icon.1.touch", - GENLIST_DESCRIPTION_ENVELOP("elm.icon.1", - rel1.offset: -10 -17; - rel2.offset: 10 10; - ) - ) - GENLIST_PART_ICON_EMAIL_CHECK_RADIO_L("elm.icon.1", "elm.padding.left") + GENLIST_PART_ICON_CHECK_RADIO_L("elm.icon.1", "elm.padding.left") GENLIST_PART_PADDING_L("elm.padding.icon1.right", "elm.icon.1") GENLIST_PART_TEXTBLOCK("elm.text.1", @@ -363,8 +365,8 @@ ) // FIXME: because script cannot be inherited, text.5 is defined here and can be inherited - GENLIST_PART_TEXT("elm.text.5", - GENLIST_DESCRIPTION_LTB("elm.text.1", "elm.padding.top", "elm.text.3", + GENLIST_PART_TEXT("elm.text.4", + GENLIST_DESCRIPTION_LTB("elm.text.1", "elm.padding.top", "elm.text.2", PARAM_EMAIL_COUNT min: 45 HEIGHT_EMAIL_MAIN; max: 45 HEIGHT_EMAIL_MAIN; @@ -383,7 +385,7 @@ ) ) GENLIST_PART_ICON("elm.icon.3", - GENLIST_DESCRIPTION_RTB("elm.padding.icon4.left", "elm.padding.top", "elm.text.3", + GENLIST_DESCRIPTION_RTB("elm.padding.icon4.left", "elm.padding.top", "elm.text.2", min: 45 45; max: HEIGHT_EMAIL_MAIN HEIGHT_EMAIL_MAIN; fixed: 1 0; @@ -391,7 +393,7 @@ ) GENLIST_PART_PADDING_R_SIZE("elm.padding.icon4.left", "elm.icon.4", GENLIST_EMAIL_PADDING_SIZE_DEFAULT) GENLIST_PART_ICON("elm.icon.4", - GENLIST_DESCRIPTION_RTB("elm.padding.right", "elm.padding.top", "elm.text.3", + GENLIST_DESCRIPTION_RTB("elm.padding.right", "elm.padding.top", "elm.text.2", min: 45 45; max: HEIGHT_EMAIL_MAIN HEIGHT_EMAIL_MAIN; fixed: 1 0; @@ -404,20 +406,20 @@ ) ) GENLIST_PART_ICON("elm.icon.2", - GENLIST_DESCRIPTION_LTB("elm.padding.icon1.right", "elm.text.1", "elm.text.2", + GENLIST_DESCRIPTION_LTB("elm.padding.icon1.right", "elm.text.1", "elm.text.3", fixed: 1 0; ) ) - GENLIST_PART_TEXTBLOCK("elm.text.3", - GENLIST_DESCRIPTION_LRT("elm.icon.2", "elm.text.4", "elm.text.1", + GENLIST_PART_TEXTBLOCK("elm.text.2", + GENLIST_DESCRIPTION_LRT("elm.icon.2", "elm.text.5", "elm.text.1", PARAM_EMAIL_SUB min: 0 HEIGHT_EMAIL_SUB; fixed: 0 1; ) DESCRIPTION_EMAIL_SUB_OTHERS ) - GENLIST_PART_TEXTBLOCK("elm.text.4", - GENLIST_DESCRIPTION_RTB("elm.padding.right", "elm.text.1", "elm.padding.text3.bottom", + GENLIST_PART_TEXTBLOCK("elm.text.5", + GENLIST_DESCRIPTION_RTB("elm.padding.right", "elm.text.1", "elm.padding.text2.bottom", PARAM_EMAIL_CONTENTS_TIME GENLIST_PARAM_TEXT_LIMIT_RT min: 0 HEIGHT_EMAIL_SUB; @@ -426,10 +428,10 @@ DESCRIPTION_EMAIL_CONTENTS_TIME_FOCUS ) - GENLIST_PART_PADDING_EMAIL_BOTTOM_TO_SIZE( "elm.padding.text3.bottom", GENLIST_EMAIL_PADDING_SIZE_SUB_TEXT_BOTTOM) + GENLIST_PART_PADDING_EMAIL_BOTTOM_TO_SIZE( "elm.padding.text2.bottom", GENLIST_EMAIL_PADDING_SIZE_SUB_TEXT_BOTTOM) - GENLIST_PART_TEXTBLOCK("elm.text.2", - GENLIST_DESCRIPTION("elm.padding.icon1.right", "elm.padding.right", "elm.padding.text3.bottom", "elm.padding.bottom", + GENLIST_PART_TEXTBLOCK("elm.text.3", + GENLIST_DESCRIPTION("elm.padding.icon1.right", "elm.padding.right", "elm.padding.text2.bottom", "elm.padding.bottom", PARAM_EMAIL_CONTENTS min: 0 HEIGHT_EMAIL_CONTENTS; ) @@ -441,7 +443,7 @@ target: "elm.text.2"; target: "elm.text.3"; target: "elm.text.4"; target: "elm.text.5"; target: "elm.swallow.colorbar"; - target: "elm.icon.1"; target: "elm.icon.1.touch"; + target: "elm.icon.1"; target: "elm.icon.2"; target: "elm.icon.3"; target: "elm.icon.4"; target: "elm.icon.4.touch"; ) @@ -459,8 +461,8 @@ data.item: "texts" "elm.text.1 elm.text.2 elm.text.3 elm.text.4 elm.text.5"; parts { - GENLIST_PART_TEXT("elm.text.5", - GENLIST_DESCRIPTION_LTB("elm.text.1", "elm.padding.top", "elm.text.3", + GENLIST_PART_TEXT("elm.text.4", + GENLIST_DESCRIPTION_LTB("elm.text.1", "elm.padding.top", "elm.text.2", visible: 1; ) DESCRIPTION_EMAIL_COUNT_OTHERS @@ -480,7 +482,7 @@ group { GENLIST_NAME("email.outbox/default") GENLIST_PROLOG_NORMAL data.item: "texts" "elm.text.1 elm.text.2 elm.text.3"; - data.item: "contents" "elm.swallow.colorbar elm.icon.1 elm.icon.1.touch elm.icon.2 elm.icon.3 elm.icon.4 elm.icon.4.touch elm.icon.5"; + data.item: "contents" "elm.swallow.colorbar elm.icon.1 elm.icon.2 elm.icon.3 elm.icon.4 elm.icon.4.touch elm.icon.5"; script { public readed = 0; @@ -495,14 +497,7 @@ GENLIST_PART_PADDING_BOTTOM_SIZE( GENLIST_EMAIL_PADDING_SIZE_BOTTOM_3LINE ) GENLIST_PART_COLORBAR - GENLIST_PART_ICON("elm.icon.1.touch", - GENLIST_DESCRIPTION_ENVELOP("elm.icon.1", - rel1.offset: -10 -17; - rel2.offset: 10 10; - ) - ) - - GENLIST_PART_ICON_EMAIL_CHECK_RADIO_L("elm.icon.1", "elm.padding.left") + GENLIST_PART_ICON_CHECK_RADIO_L("elm.icon.1", "elm.padding.left") GENLIST_PART_PADDING_L("elm.padding.icon1.right", "elm.icon.1") GENLIST_PART_TEXTBLOCK("elm.text.1", @@ -515,7 +510,7 @@ ) // FIXME: because script cannot be inherited, text.4 is defined here and can be inherited GENLIST_PART_TEXT("elm.text.4", - GENLIST_DESCRIPTION_LTB("elm.text.1", "elm.padding.top", "elm.text.3", + GENLIST_DESCRIPTION_LTB("elm.text.1", "elm.padding.top", "elm.text.2", PARAM_EMAIL_COUNT min: 0 HEIGHT_EMAIL_MAIN; max: 0 HEIGHT_EMAIL_MAIN; @@ -534,7 +529,7 @@ ) ) GENLIST_PART_ICON("elm.icon.3", - GENLIST_DESCRIPTION_RTB("elm.padding.icon4.left", "elm.padding.top", "elm.text.3", + GENLIST_DESCRIPTION_RTB("elm.padding.icon4.left", "elm.padding.top", "elm.text.2", min: 45 45; max: HEIGHT_EMAIL_MAIN HEIGHT_EMAIL_MAIN; fixed: 1 0; @@ -542,7 +537,7 @@ ) GENLIST_PART_PADDING_R_SIZE("elm.padding.icon4.left", "elm.icon.4", GENLIST_EMAIL_PADDING_SIZE_DEFAULT) GENLIST_PART_ICON("elm.icon.4", - GENLIST_DESCRIPTION_RTB("elm.padding.right", "elm.padding.top", "elm.text.3", + GENLIST_DESCRIPTION_RTB("elm.padding.right", "elm.padding.top", "elm.text.2", min: 45 45; max: HEIGHT_EMAIL_MAIN HEIGHT_EMAIL_MAIN; fixed: 1 0; @@ -556,11 +551,11 @@ ) GENLIST_PART_ICON("elm.icon.2", - GENLIST_DESCRIPTION_LTB("elm.padding.icon1.right", "elm.text.1", "elm.text.2", + GENLIST_DESCRIPTION_LTB("elm.padding.icon1.right", "elm.text.1", "elm.text.3", fixed: 1 1; ) ) - GENLIST_PART_TEXTBLOCK("elm.text.3", + GENLIST_PART_TEXTBLOCK("elm.text.2", GENLIST_DESCRIPTION_LRT("elm.icon.2", "elm.padding.icon5.left", "elm.text.1", PARAM_EMAIL_SUB min: 0 HEIGHT_EMAIL_SUB; @@ -569,10 +564,10 @@ DESCRIPTION_EMAIL_SUB_OTHERS ) - GENLIST_PART_PADDING_EMAIL_BOTTOM_TO_SIZE( "elm.padding.text3.bottom", GENLIST_EMAIL_PADDING_SIZE_SUB_TEXT_BOTTOM) + GENLIST_PART_PADDING_EMAIL_OUTBOX_BOTTOM_TO_SIZE( "elm.padding.text2.bottom", GENLIST_EMAIL_PADDING_SIZE_SUB_TEXT_BOTTOM) - GENLIST_PART_TEXTBLOCK("elm.text.2", - GENLIST_DESCRIPTION("elm.padding.icon1.right", "elm.padding.icon5.left", "elm.padding.text3.bottom", "elm.padding.bottom", + GENLIST_PART_TEXTBLOCK("elm.text.3", + GENLIST_DESCRIPTION("elm.padding.icon1.right", "elm.padding.icon5.left", "elm.padding.text2.bottom", "elm.padding.bottom", PARAM_EMAIL_CONTENTS min: 0 HEIGHT_EMAIL_CONTENTS; ) -- 2.7.4