From: sh10233.lee Date: Wed, 12 Jun 2013 14:43:08 +0000 (+0900) Subject: [Genlist] GUI Dark Theme ver 0.3 X-Git-Tag: submit/tizen/20131004.114939~194 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6e428e1db423f08491df497d86c9bef17e4b491f;p=platform%2Fcore%2Fuifw%2Fefl-theme-tizen.git [Genlist] GUI Dark Theme ver 0.3 Change-Id: I28239a6a9dbabc43d420c73c3083efd40f9fcda2 --- diff --git a/themes/images/HD/dark/Content_views/00_folder_icon_folder.png b/themes/images/HD/dark/Content_views/00_folder_icon_folder.png old mode 100644 new mode 100755 diff --git a/themes/images/HD/dark/Content_views/00_folder_icon_folder_minus.png b/themes/images/HD/dark/Content_views/00_folder_icon_folder_minus.png old mode 100644 new mode 100755 diff --git a/themes/images/HD/dark/Content_views/00_folder_icon_folder_plus.png b/themes/images/HD/dark/Content_views/00_folder_icon_folder_plus.png old mode 100644 new mode 100755 diff --git a/themes/inc/tizen-dark-inc.edc b/themes/inc/tizen-dark-inc.edc index d8f49dc..1bef5fd 100755 --- a/themes/inc/tizen-dark-inc.edc +++ b/themes/inc/tizen-dark-inc.edc @@ -222,8 +222,8 @@ #define GENLIST_LIST_DIM_COLOR 0 0 0 255 #define GENLIST_LIST_LINE1_COLOR 0 0 0 255 #define GENLIST_LIST_LINE2_COLOR 64 64 64 255 -#define GENLIST_LIST_DIVIDER1_COLOR 255 255 255 102 -#define GENLIST_LIST_DIVIDER2_COLOR 255 255 255 102 +#define GENLIST_LIST_DIVIDER1_COLOR 255 255 255 51 +#define GENLIST_LIST_DIVIDER2_COLOR 255 255 255 51 #define GENLIST_LIST_CENTERLINE1_COLOR 206 205 202 255 #define GENLIST_SELECT_ALL_BG_COLOR 34 44 71 255 @@ -231,9 +231,9 @@ // Group Index #define GENLIST_GROUPINDEX_LIST_SIZE 32 #define GENLIST_GROUPINDEX_LIST_COLOR 10 82 138 255 -#define GENLIST_GROUPINDEX_LIST_FOCUS_COLOR 255 255 255 255 -#define GENLIST_GROUPINDEX_LIST_COLOR_STYLE "#3B73B6FF" -#define GENLIST_GROUPINDEX_LIST_FOCUS_COLOR_STYLE "#FFFFFFFF" +#define GENLIST_GROUPINDEX_LIST_FOCUS_COLOR 250 250 250 255 +#define GENLIST_GROUPINDEX_LIST_COLOR_STYLE "#0A528AFF" +#define GENLIST_GROUPINDEX_LIST_FOCUS_COLOR_STYLE "#FAFAFAFF" #define GENLIST_GROUPINDEX_LIST_BG_COLOR 0 0 0 255 #define GENLIST_GROUPINDEX_LIST_PRESS_COLOR 43 58 175 255 @@ -243,23 +243,23 @@ // Genlist Text #define GENLIST_LIST_MAIN_TEXT_SIZE 44 #define GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR 250 250 250 255 -#define GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR_STYLE "#000000FF" +#define GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR_STYLE "#FAFAFAFF" #define GENLIST_LIST_MAIN_TEXT_UNREAD_DIM_COLOR 250 250 250 102 -#define GENLIST_LIST_MAIN_TEXT_UNREAD_DIM_COLOR_STYLE "#00000066" +#define GENLIST_LIST_MAIN_TEXT_UNREAD_DIM_COLOR_STYLE "#FAFAFA66" #define GENLIST_LIST_MAIN_TEXT_READ_COLOR 110 111 118 255 #define GENLIST_LIST_MAIN_TEXT_READ_DIM_COLOR 110 111 118 204 #define GENLIST_LIST_TEXT_FOCUS_COLOR 250 250 250 255 -#define GENLIST_LIST_TEXT_FOCUS_COLOR_STYLE "#FFFFFFFF" +#define GENLIST_LIST_TEXT_FOCUS_COLOR_STYLE "#FAFAFAFF" #define GENLIST_LIST_SUB_TEXT_SIZE 32 #define GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR 110 111 118 255 -#define GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR_STYLE "#808080FF" +#define GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR_STYLE "#6E6F76FF" #define GENLIST_LIST_SUB_TEXT_DEFAULT_DIM_COLOR 110 111 118 204 -#define GENLIST_LIST_SUB_TEXT_DEFAULT_DIM_COLOR_STYLE "#808080CC" +#define GENLIST_LIST_SUB_TEXT_DEFAULT_DIM_COLOR_STYLE "#6E6F76CC" #define GENLIST_LIST_SUB_TEXT_SETTINGS_COLOR 104 144 255 255 -#define GENLIST_LIST_SUB_TEXT_SETTINGS_COLOR_STYLE "#3B73B6FF" +#define GENLIST_LIST_SUB_TEXT_SETTINGS_COLOR_STYLE "#6890FFFF" #define GENLIST_LIST_SUB_TEXT_SETTINGS_DIM_COLOR 104 144 255 76 -#define GENLIST_LIST_SUB_TEXT_SETTINGS_DIM_COLOR_STYLE "#3B73B64C" +#define GENLIST_LIST_SUB_TEXT_SETTINGS_DIM_COLOR_STYLE "#6890FF4C" #define GENLIST_LIST_SUB_TEXT_02_SIZE 24 #define GENLIST_LIST_SUB_TEXT_02_COLOR 209 0 0 255 diff --git a/themes/widgets/genlist/genlist_decorate.edc b/themes/widgets/genlist/genlist_decorate.edc index b696af8..7d7b8c7 100644 --- a/themes/widgets/genlist/genlist_decorate.edc +++ b/themes/widgets/genlist/genlist_decorate.edc @@ -38,10 +38,11 @@ } } GENLIST_PART_BASE + GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT GENLIST_PART_PADDING_RIGHT - GENLIST_PART_PADDING_TOP_SIZE( 1 ) // (82-80)/2 - GENLIST_PART_PADDING_BOTTOM_SIZE( 1 ) // (82-80)/2 + GENLIST_PART_PADDING_TOP_SIZE( 1 ) // (83-80)/3 + GENLIST_PART_PADDING_BOTTOM_SIZE( 2 ) // (83-80)/3 + 1 GENLIST_PART_ICON_CHECK_RADIO_L("elm.icon", "elm.padding.left") GENLIST_PART_PADDING_L("elm.padding.icon.right", "elm.icon") GENLIST_PART_LISTITEM_("elm.text", 80, diff --git a/themes/widgets/genlist/genlist_macro.edc b/themes/widgets/genlist/genlist_macro.edc index ac73de8..5aa0ea3 100755 --- a/themes/widgets/genlist/genlist_macro.edc +++ b/themes/widgets/genlist/genlist_macro.edc @@ -29,8 +29,8 @@ // if size is different for each theme, split it into each theme inc. #define GENLIST_HEIGHT_1LINE 110 // (114 - top/bottom padding) -#define GENLIST_HEIGHT_2LINE_MAIN 54 -#define GENLIST_HEIGHT_2LINE_SUB 42 +#define GENLIST_HEIGHT_2LINE_MAIN 57 +#define GENLIST_HEIGHT_2LINE_SUB 45 #define GENLIST_HEIGHT_MULTILINE_SUB 38 #define GENLIST_PART_LIST_LINE_HEIGHT 1 #define GENLIST_HEIGHT_GROUPTITLE 46 @@ -42,8 +42,8 @@ #define GENLIST_PADDING_SIZE_TOP 2 #define GENLIST_PADDING_SIZE_BOTTOM 2 // ----------------------------------------------------- -#define GENLIST_PADDING_SIZE_TOP_2LINE 22 -#define GENLIST_PADDING_SIZE_BOTTOM_2LINE 22 +#define GENLIST_PADDING_SIZE_TOP_2LINE 19 +#define GENLIST_PADDING_SIZE_BOTTOM_2LINE 19 #define GENLIST_PADDING_SIZE_TOP_3LINE 17 #define GENLIST_PADDING_SIZE_BOTTOM_3LINE 17 #define GENLIST_PADDING_SIZE_NDEPTH 26 @@ -51,6 +51,8 @@ #define DIALOGUE_PADDING_SCROLLER 16 #define DIALOGUE_PADDING_SIZE_LEFT 16+20 #define DIALOGUE_PADDING_SIZE_RIGHT 16+20 +#define DIALOGUE_EDITFIELD_PADDING_SIZE_LEFT 16+10 +#define DIALOGUE_EDITFIELD_PADDING_SIZE_RIGHT 16+10 #define GENLIST_ICON_SMALL_SIZE 45 #define GENLIST_ICON_STAR_SIZE 45 @@ -409,6 +411,20 @@ GENLIST_PART_FOCUS_DIALOGUE \ } +#define GENLIST_DIALOGUE_EDITFIELD_INHERIT_BODY( _PARTS ) \ + data.item: "treesize" 0; \ + parts { \ + GENLIST_PART_BG_NORMAL_OFF \ + GENLIST_PART_BOTTOM_LINE_OFF \ + GENLIST_PART_BG_DIALOGUE \ + GENLIST_PART_PADDING_LEFT_SIZE( DIALOGUE_EDITFIELD_PADDING_SIZE_LEFT ) \ + GENLIST_PART_PADDING_RIGHT_EDIT \ + _PARTS \ + GENLIST_PART_FLIP \ + GENLIST_PART_FOCUS_DIALOGUE \ + } + + #define GENLIST_INHERIT_THUMB_CIRCLE(SIZE_PREFIX, MASK_SIZE, PARENT) \ images { \ image: "Content_views/Icon_masking/"SIZE_PREFIX"/00_list_circle_icon_bg_normal.png" COMP; \ diff --git a/themes/widgets/genlist/genlist_normal.edc b/themes/widgets/genlist/genlist_normal.edc index 8cf236a..e606fa8 100644 --- a/themes/widgets/genlist/genlist_normal.edc +++ b/themes/widgets/genlist/genlist_normal.edc @@ -75,16 +75,16 @@ GENLIST_PART_BASE GENLIST_PART_BG_NORMAL GENLIST_PART_BOTTOM_LINE - GENLIST_PART_PADDING_LEFT - GENLIST_PART_PADDING_RIGHT - GENLIST_PART_PADDING_TOP_SIZE(29) - GENLIST_PART_PADDING_BOTTOM_SIZE(27) + GENLIST_PART_PADDING_LEFT_SIZE(16) + GENLIST_PART_PADDING_RIGHT_SIZE(16) + GENLIST_PART_PADDING_TOP_SIZE(8) + GENLIST_PART_PADDING_BOTTOM_SIZE(8) GENLIST_PART_ICON("elm.icon.entry", GENLIST_DESCRIPTION( "elm.padding.left", "elm.padding.right", "elm.padding.top", "elm.padding.bottom", - min: 0 48; // This is tuned value for exact entry size. + min: 0 96; // This is tuned value for exact entry size. ) ) GENLIST_PART_FLIP @@ -117,19 +117,20 @@ GENLIST_PART_BASE GENLIST_PART_BG_NORMAL GENLIST_PART_BOTTOM_LINE - GENLIST_PART_PADDING_LEFT - GENLIST_PART_PADDING_RIGHT - GENLIST_PART_PADDING_TOP_SIZE(22) - GENLIST_PART_PADDING_BOTTOM_SIZE(22) + GENLIST_PART_PADDING_LEFT_SIZE( 16 ) + GENLIST_PART_PADDING_RIGHT_SIZE( 16 ) + GENLIST_PART_PADDING_TOP_SIZE(17) + GENLIST_PART_PADDING_BOTTOM_SIZE(16) + GENLIST_PART_PADDING_L_SIZE("elm.padding.title", "elm.padding.left", 10) GENLIST_PART_SUBITEM_SETTINGS_LRT("elm.text", GENLIST_HEIGHT_2LINE_SUB, - "elm.padding.left", "elm.padding.right", "elm.padding.top" + "elm.padding.title", "elm.padding.right", "elm.padding.top" ) GENLIST_PART_ICON("elm.icon.entry", GENLIST_DESCRIPTION( "elm.padding.left", "elm.padding.right", "elm.text", "elm.padding.bottom", - min: 0 48; // This is tuned value for exact entry size. + min: 0 62; // This is tuned value for exact entry size. ) ) GENLIST_PART_FLIP @@ -2943,8 +2944,8 @@ GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT GENLIST_PART_PADDING_RIGHT - GENLIST_PART_PADDING_TOP_SIZE( 16 ) - GENLIST_PART_PADDING_BOTTOM_SIZE( 16 ) + GENLIST_PART_PADDING_TOP_SIZE( 10 ) + GENLIST_PART_PADDING_BOTTOM_SIZE( 10 ) GENLIST_PART_LISTITEM("elm.text.1", GENLIST_DESCRIPTION_LRT("elm.padding.left", "elm.padding.icon5.left", "elm.padding.top", @@ -2965,7 +2966,7 @@ "elm.padding.right", "elm.padding.top", "elm.text.2") - GENLIST_PART_PADDING_T_SIZE("elm.padding.text1.bottom", "elm.text.1", 16) + GENLIST_PART_PADDING_T_SIZE("elm.padding.text1.bottom", "elm.text.1", 14) GENLIST_PART_TEXTBLOCK("elm.text.2", GENLIST_DESCRIPTION("elm.padding.left", "elm.padding.right", "elm.padding.text1.bottom", "elm.padding.bottom", GENLIST_PARAM_SUBITEM_DEFAULT_TB_WRAP @@ -3021,25 +3022,25 @@ /************************************************************/ /******************** Dialogue Group ************************/ /************************************************************/ -// 2.2.6.1 (Dialogue) +// 2.4.3 (Dialogue) group { GENLIST_NAME("dialogue/editfield/default") alias: "elm/layout/dialogue/editfield/default"; inherit: "elm/genlist/item/editfield/default"; data.item: "contents" "elm.icon.entry elm.icon.edit"; - GENLIST_DIALOGUE_INHERIT_BODY( ; ) + GENLIST_DIALOGUE_EDITFIELD_INHERIT_BODY( ; ) GENLIST_PROGRAMS_DIALOGUE_ENTRY( target: "elm.icon.entry"; target: "elm.icon.edit";) } -// 2.2.6.2 (Dialogue) +// 2.4.3 (Dialogue) group { GENLIST_NAME("dialogue/editfield/title/default") alias: "elm/layout/dialogue/editfield/title/default"; inherit: "elm/genlist/item/editfield/title/default"; data.item: "contents" "elm.icon.entry elm.icon.edit"; - GENLIST_DIALOGUE_INHERIT_BODY( ; ) + GENLIST_DIALOGUE_EDITFIELD_INHERIT_BODY( ; ) GENLIST_PROGRAMS_DIALOGUE_ENTRY( target: "elm.icon.entry"; target: "elm.icon.edit";) } @@ -3908,7 +3909,6 @@ // 2.4.2.18 group { GENLIST_NAME("dialogue/multiline/2text/default") alias: "elm/layout/dialogue/multiline/2text/default"; - inherit: "elm/genlist/item/multiline/2text/default"; // FIXME: deprecated name, will be removed alias: "elm/genlist/item/multiline/dialogue/2text/default"; @@ -3917,10 +3917,40 @@ alias: "elm/genlist/item_compress_odd/multiline/dialogue/2text/default"; alias: "elm/layout/multiline/dialogue/2text/default"; + GENLIST_PROLOG_NORMAL + data.item: "texts" "elm.text.1 elm.text.2"; data.item: "contents" "elm.icon.edit"; - GENLIST_DIALOGUE_INHERIT_BODY( ; ) + parts { + GENLIST_PART_BASE + GENLIST_PART_BG_DIALOGUE + GENLIST_PART_PADDING_LEFT_SIZE( DIALOGUE_PADDING_SIZE_LEFT ) + GENLIST_PART_PADDING_RIGHT_EDIT + GENLIST_PART_PADDING_TOP_2LINE + GENLIST_PART_PADDING_BOTTOM_2LINE + GENLIST_PART_TEXT("elm.text.1", + GENLIST_DESCRIPTION_LRT("elm.padding.left", "elm.padding.right", "elm.padding.top", + GENLIST_PARAM_LISTITEM + min: 0 GENLIST_HEIGHT_2LINE_MAIN; + fixed: 0 1; + ) + GENLIST_DESCRIPTION_LISTITEM_OTHERS + ) + GENLIST_PART_PADDING_T_SIZE("elm.padding.text1.bottom", "elm.text.1", 4) + GENLIST_PART_TEXTBLOCK("elm.text.2", + GENLIST_DESCRIPTION("elm.padding.left", "elm.padding.right", "elm.padding.text1.bottom", "elm.padding.bottom", + GENLIST_PARAM_SUBITEM_DEFAULT_TB_WRAP + min: 0 GENLIST_HEIGHT_MULTILINE_SUB; + ) + GENLIST_DESCRIPTION_SUBITEM_DEFAULT_OTHERS_TB_WRAP + ) + GENLIST_PART_FLIP + GENLIST_PART_FOCUS_DIALOGUE + } + GENLIST_PROGRAMS_DIALOGUE( target: "elm.text.1"; target: "elm.text.2"; ) + GENLIST_PROGRAM_SOUND("elm.text.1") + GENLIST_PROGRAM_SOUND("elm.text.2") } // 2.4.2.19 @@ -4008,8 +4038,9 @@ GENLIST_PART_PADDING_BOTTOM_SIZE( 0 ) GENLIST_PART_PADDING_RIGHT_SIZE( 26 ) + GENLIST_PART_PADDING_R("elm.padding.icon.right", "elm.icon"); GENLIST_PART_TEXT("elm.text", - GENLIST_DESCRIPTION("elm.padding.left", "elm.icon", + GENLIST_DESCRIPTION("elm.padding.left", "elm.padding.icon.right", "elm.padding.top", "elm.padding.bottom", GENLIST_PARAM_DIALOGUE_GROUP_TITLE min: 0 GENLIST_HEIGHT_GROUPTITLE; @@ -4072,19 +4103,19 @@ GENLIST_PART_BASE GENLIST_PART_PADDING_LEFT_SIZE( DIALOGUE_PADDING_SIZE_LEFT ) GENLIST_PART_PADDING_RIGHT_EDIT - GENLIST_PART_PADDING_TOP_SIZE(20) - GENLIST_PART_PADDING_BOTTOM_SIZE(20) + GENLIST_PART_PADDING_TOP_SIZE(19) + GENLIST_PART_PADDING_BOTTOM_SIZE(19) GENLIST_PART_TEXT("elm.text.1", GENLIST_DESCRIPTION_LRT("elm.padding.left", "elm.padding.icon.left", "elm.padding.top", GENLIST_PARAM_LISTITEM - min: 0 54; fixed:1 1;) + min: 0 57; fixed:1 1;) GENLIST_DESCRIPTION_LISTITEM_OTHERS ) GENLIST_PART_TEXT("elm.text.2", GENLIST_DESCRIPTION("elm.padding.left", "elm.padding.icon.left", "elm.text.1", "elm.padding.bottom", GENLIST_PARAM_SUBITEM_DEFAULT - min: 0 42;) + min: 0 45;) GENLIST_DESCRIPTION_SUBITEM_DEFAULT_OTHERS ) @@ -4114,25 +4145,26 @@ GENLIST_PART_BASE GENLIST_PART_PADDING_LEFT_SIZE( DIALOGUE_PADDING_SIZE_LEFT ) GENLIST_PART_PADDING_RIGHT_EDIT - GENLIST_PART_PADDING_TOP_SIZE(20) - GENLIST_PART_PADDING_BOTTOM_SIZE(20) + GENLIST_PART_PADDING_TOP_SIZE(19) + GENLIST_PART_PADDING_BOTTOM_SIZE(19) GENLIST_PART_TEXT("elm.text.1", GENLIST_DESCRIPTION_LRT("elm.padding.left", "elm.padding.icon1.left", "elm.padding.top", GENLIST_PARAM_LISTITEM - min: 0 54; fixed:1 1;) + min: 0 57; fixed:1 1;) GENLIST_DESCRIPTION_LISTITEM_OTHERS ) + GENLIST_PART_PADDING_T_SIZE("elm.padding.text1.bottom", "elm.text.1", 4) GENLIST_PART_TEXT("elm.text.2", - GENLIST_DESCRIPTION("elm.padding.left", "elm.padding.icon1.left", "elm.text.1", "elm.text.3", + GENLIST_DESCRIPTION("elm.padding.left", "elm.padding.icon1.left", "elm.padding.text1.bottom", "elm.text.3", GENLIST_PARAM_SUBITEM_DEFAULT - min: 0 34;) + min: 0 38;) GENLIST_DESCRIPTION_SUBITEM_DEFAULT_OTHERS ) GENLIST_PART_TEXT("elm.text.3", GENLIST_DESCRIPTION_LRB("elm.padding.left", "elm.padding.icon1.left", "elm.padding.bottom", GENLIST_PARAM_SUBITEM_DEFAULT - min: 0 34; fixed: 1 1; ) + min: 0 38; fixed: 1 1; ) GENLIST_DESCRIPTION_SUBITEM_DEFAULT_OTHERS )