From a1b961a70a19fb9e3be443f465ac8d6ca41bde9d Mon Sep 17 00:00:00 2001 From: Daniel Juyung Seo Date: Fri, 23 Dec 2011 17:48:23 +0900 Subject: [PATCH] [*][Genlist] Added dialogue/1text.4icon style (4.2.13). This style came from dialogue/4icon. I also fixed dialogue/4icon. But it has to be removed soon. Change-Id: Id38aa888b784b9ac9c34bef3a6b5e21518e5161d --- themes/inc/tizen-black-hd-inc.edc | 6 +- themes/inc/tizen-black-inc.edc | 6 +- themes/inc/tizen-hd-inc.edc | 6 +- themes/inc/tizen-inc.edc | 6 +- themes/widgets/genlist/genlist_normal.edc | 354 +++++++++++++++++++++++++++++- 5 files changed, 357 insertions(+), 21 deletions(-) diff --git a/themes/inc/tizen-black-hd-inc.edc b/themes/inc/tizen-black-hd-inc.edc index a8955cf..59a6e0e 100644 --- a/themes/inc/tizen-black-hd-inc.edc +++ b/themes/inc/tizen-black-hd-inc.edc @@ -113,7 +113,7 @@ #define GENLIST_HEIGHT_177_INC 177 #define GENLIST_HEIGHT_182_INC 182 #define GENLIST_HEIGHT_190_INC 190 -#define GENLIST_HEIGHT_206_INC 206 +#define GENLIST_HEIGHT_207_INC 207 #define GENLIST_HEIGHT_260_INC 260 #define GENLIST_HEIGHT_291_INC 291 #define GENLIST_HEIGHT_454_INC 454 @@ -138,7 +138,7 @@ #define GENLIST_PADDING_46_INC 46 #define GENLIST_PADDING_48_INC 48 #define GENLIST_PADDING_64_INC 64 -#define GENLIST_PADDING_106_INC 106 +#define GENLIST_PADDING_74_INC 74 #define GENLIST_FONT_27_INC 27 #define GENLIST_FONT_28_INC 28 @@ -176,7 +176,7 @@ #define GENLIST_SIZE_90_INC 90 #define GENLIST_SIZE_96_INC 96 #define GENLIST_SIZE_112_INC 112 -#define GENLIST_SIZE_115_INC 115 +#define GENLIST_SIZE_116_INC 116 #define GENLIST_SIZE_128_INC 128 #define GENLIST_SIZE_133_INC 133 #define GENLIST_SIZE_141_INC 141 diff --git a/themes/inc/tizen-black-inc.edc b/themes/inc/tizen-black-inc.edc index c0a526a..6259aab 100644 --- a/themes/inc/tizen-black-inc.edc +++ b/themes/inc/tizen-black-inc.edc @@ -110,7 +110,7 @@ #define GENLIST_HEIGHT_177_INC 111 #define GENLIST_HEIGHT_182_INC 114 #define GENLIST_HEIGHT_190_INC 118 -#define GENLIST_HEIGHT_206_INC 129 +#define GENLIST_HEIGHT_207_INC 129 #define GENLIST_HEIGHT_260_INC 162 #define GENLIST_HEIGHT_291_INC 182 #define GENLIST_HEIGHT_454_INC 284 @@ -135,7 +135,7 @@ #define GENLIST_PADDING_46_INC 29 #define GENLIST_PADDING_48_INC 30 #define GENLIST_PADDING_64_INC 40 -#define GENLIST_PADDING_106_INC 66 +#define GENLIST_PADDING_74_INC 46 #define GENLIST_FONT_27_INC 17 #define GENLIST_FONT_28_INC 18 @@ -173,7 +173,7 @@ #define GENLIST_SIZE_90_INC 56 #define GENLIST_SIZE_96_INC 60 #define GENLIST_SIZE_112_INC 70 -#define GENLIST_SIZE_115_INC 72 +#define GENLIST_SIZE_116_INC 73 #define GENLIST_SIZE_128_INC 80 #define GENLIST_SIZE_133_INC 83 #define GENLIST_SIZE_141_INC 88 diff --git a/themes/inc/tizen-hd-inc.edc b/themes/inc/tizen-hd-inc.edc index 45ed987..bb0c102 100644 --- a/themes/inc/tizen-hd-inc.edc +++ b/themes/inc/tizen-hd-inc.edc @@ -113,7 +113,7 @@ #define GENLIST_HEIGHT_177_INC 177 #define GENLIST_HEIGHT_182_INC 182 #define GENLIST_HEIGHT_190_INC 190 -#define GENLIST_HEIGHT_206_INC 206 +#define GENLIST_HEIGHT_207_INC 207 #define GENLIST_HEIGHT_260_INC 260 #define GENLIST_HEIGHT_291_INC 291 #define GENLIST_HEIGHT_454_INC 454 @@ -138,7 +138,7 @@ #define GENLIST_PADDING_46_INC 46 #define GENLIST_PADDING_48_INC 48 #define GENLIST_PADDING_64_INC 64 -#define GENLIST_PADDING_106_INC 106 +#define GENLIST_PADDING_74_INC 74 #define GENLIST_FONT_27_INC 27 #define GENLIST_FONT_28_INC 28 @@ -176,7 +176,7 @@ #define GENLIST_SIZE_90_INC 90 #define GENLIST_SIZE_96_INC 96 #define GENLIST_SIZE_112_INC 112 -#define GENLIST_SIZE_115_INC 115 +#define GENLIST_SIZE_116_INC 116 #define GENLIST_SIZE_128_INC 128 #define GENLIST_SIZE_133_INC 133 #define GENLIST_SIZE_141_INC 141 diff --git a/themes/inc/tizen-inc.edc b/themes/inc/tizen-inc.edc index 43a1d02..121356c 100644 --- a/themes/inc/tizen-inc.edc +++ b/themes/inc/tizen-inc.edc @@ -110,7 +110,7 @@ #define GENLIST_HEIGHT_177_INC 111 #define GENLIST_HEIGHT_182_INC 114 #define GENLIST_HEIGHT_190_INC 118 -#define GENLIST_HEIGHT_206_INC 129 +#define GENLIST_HEIGHT_207_INC 129 #define GENLIST_HEIGHT_260_INC 162 #define GENLIST_HEIGHT_291_INC 182 #define GENLIST_HEIGHT_454_INC 284 @@ -135,7 +135,7 @@ #define GENLIST_PADDING_46_INC 29 #define GENLIST_PADDING_48_INC 30 #define GENLIST_PADDING_64_INC 40 -#define GENLIST_PADDING_106_INC 66 +#define GENLIST_PADDING_74_INC 46 #define GENLIST_FONT_27_INC 17 #define GENLIST_FONT_28_INC 18 @@ -173,7 +173,7 @@ #define GENLIST_SIZE_90_INC 56 #define GENLIST_SIZE_96_INC 60 #define GENLIST_SIZE_112_INC 70 -#define GENLIST_SIZE_115_INC 72 +#define GENLIST_SIZE_116_INC 73 #define GENLIST_SIZE_128_INC 80 #define GENLIST_SIZE_133_INC 83 #define GENLIST_SIZE_141_INC 88 diff --git a/themes/widgets/genlist/genlist_normal.edc b/themes/widgets/genlist/genlist_normal.edc index 3c21c21..876a9bd 100644 --- a/themes/widgets/genlist/genlist_normal.edc +++ b/themes/widgets/genlist/genlist_normal.edc @@ -14064,6 +14064,341 @@ } } + /* password style 4.2.13 */ + /* on landscape mode, 4 swallow parts will be placed left-align basis with having padding on the right side. */ + group { name: "elm/genlist/item/dialogue/1text.4icon/default"; + alias: "elm/genlist/item_odd/dialogue/1text.4icon/default"; + alias: "elm/genlist/item_compress/dialogue/1text.4icon/default"; + alias: "elm/genlist/item_compress_odd/dialogue/1text.4icon/default"; + alias: "elm/layout/dialogue/4icon"; + data.item: "stacking" "above"; + data.item: "selectraise" "on"; + data.item: "icons" "elm.icon.1 elm.icon.2 elm.icon.3 elm.icon.4"; + data.item: "labels" "elm.text.1"; + images { + image : "00_input_bg.png" COMP; + } + parts { + GENLIST_PART_BASE( GENLIST_HEIGHT_207_INC ) + GENLIST_PART_BG_IMAGE + GENLIST_PART_BOTTOM_LINE + GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC ) + GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_24_INC ) + GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_32_INC ) + GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC ) + GENLIST_PART_DIALOGUE_ITEM + part { name: "elm.text.1"; + clip_to: "disclip"; + type: TEXT; + mouse_events: 0; + scale: 1; + description { state: "default" 0.0; + min: 0 GENLIST_SIZE_48_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; + color: GENLIST_PART_SUB_TEXT_COLOR_INC; + text { + font: "SLP:style=Medium"; + size: GENLIST_FONT_32_INC; + min: 0 1; + align: 0.0 0.5; + } + } + description { state: "selected" 0.0; + inherit: "default" 0.0; + color: GENLIST_PART_TEXT_SELECTED_COLOR_INC; + } + } + part { name: "elm.padding.icon1.left"; + clip_to: "disclip"; + type: RECT; + scale: 1; + description { state: "default" 0.0; + min: GENLIST_PADDING_74_INC 0; + fixed: 1 0; + rel1 { + relative: 1.0 0.0; + to_x: "elm.rect.dialogue"; + to_y: "elm.padding.bottom"; + } + rel2 { + relative: 1.0 0.0; + to_x: "elm.rect.dialogue"; + to_y: "elm.padding.bottom"; + } + align: 0.0 1.0; + visible: 0; + } + } + part { name: "elm.icon1.bg"; + clip_to: "disclip"; + type: IMAGE; + scale: 1; + description { state: "default" 0.0; + min: GENLIST_SIZE_116_INC GENLIST_SIZE_116_INC; + fixed: 1 1; + rel1 { + relative: 1.0 0.0; + to_x: "elm.padding.icon1.left"; + to_y: "elm.padding.bottom"; + } + rel2 { + relative: 1.0 0.0; + to_x: "elm.padding.icon1.left"; + to_y: "elm.padding.bottom"; + } + align: 0.0 1.0; + image.normal: "00_input_bg.png"; + image.border: 5 5 5 5; + image.border_scale: 1; + } + } + part { name: "elm.icon.1"; + clip_to: "disclip"; + type: SWALLOW; + scale: 1; + description { state: "default" 0.0; + rel1 { + to: "elm.icon1.bg"; + offset: 2 2; + } + rel2 { + to: "elm.icon1.bg"; + offset: -3 -3; + } + align: 0.5 0.5; + } + } + part { name: "elm.padding.icon2.left"; + clip_to: "disclip"; + type: RECT; + scale: 1; + description { state: "default" 0.0; + min: GENLIST_SIZE_32_INC 0; + fixed: 1 0; + rel1 { + relative: 1.0 0.0; + to_x: "elm.icon1.bg"; + to_y: "elm.padding.bottom"; + } + rel2 { + relative: 1.0 0.0; + to_x: "elm.icon1.bg"; + to_y: "elm.padding.bottom"; + } + align: 0.0 1.0; + visible: 0; + } + } + part { name: "elm.icon2.bg"; + clip_to: "disclip"; + type: IMAGE; + scale: 1; + description { state: "default" 0.0; + min: GENLIST_SIZE_116_INC GENLIST_SIZE_116_INC; + fixed: 1 1; + rel1 { + relative: 1.0 0.0; + to_x: "elm.padding.icon2.left"; + to_y: "elm.padding.bottom"; + } + rel2 { + relative: 1.0 0.0; + to_x: "elm.padding.icon2.left"; + to_y: "elm.padding.bottom"; + } + align: 0.0 1.0; + image.normal: "00_input_bg.png"; + image.border: 5 5 5 5; + image.border_scale: 1; + } + } + part { name: "elm.icon.2"; + clip_to: "disclip"; + type: SWALLOW; + scale: 1; + description { state: "default" 0.0; + rel1 { + to: "elm.icon2.bg"; + offset: 2 2; + } + rel2 { + to: "elm.icon2.bg"; + offset: -3 -3; + } + align: 0.5 0.5; + } + } + part { name: "elm.padding.icon3.left"; + clip_to: "disclip"; + type: RECT; + scale: 1; + description { state: "default" 0.0; + min: GENLIST_SIZE_32_INC 0; + fixed: 1 0; + rel1 { + relative: 1.0 0.0; + to_x: "elm.icon2.bg"; + to_y: "elm.padding.bottom"; + } + rel2 { + relative: 1.0 0.0; + to_x: "elm.icon2.bg"; + to_y: "elm.padding.bottom"; + } + align: 0.0 1.0; + visible: 0; + } + } + part { name: "elm.icon3.bg"; + clip_to: "disclip"; + type: IMAGE; + scale: 1; + description { state: "default" 0.0; + min: GENLIST_SIZE_116_INC GENLIST_SIZE_116_INC; + fixed: 1 1; + rel1 { + relative: 1.0 0.0; + to_x: "elm.padding.icon3.left"; + to_y: "elm.padding.bottom"; + } + rel2 { + relative: 1.0 0.0; + to_x: "elm.padding.icon3.left"; + to_y: "elm.padding.bottom"; + } + align: 0.0 1.0; + image.normal: "00_input_bg.png"; + image.border: 5 5 5 5; + image.border_scale: 1; + } + } + part { name: "elm.icon.3"; + clip_to: "disclip"; + type: SWALLOW; + scale: 1; + description { state: "default" 0.0; + rel1 { + to: "elm.icon3.bg"; + offset: 2 2; + } + rel2 { + to: "elm.icon3.bg"; + offset: -3 -3; + } + align: 0.5 0.5; + } + } + part { name: "elm.padding.icon4.left"; + clip_to: "disclip"; + type: RECT; + scale: 1; + description { state: "default" 0.0; + min: GENLIST_SIZE_32_INC 0; + fixed: 1 0; + rel1 { + relative: 1.0 0.0; + to_x: "elm.icon3.bg"; + to_y: "elm.padding.bottom"; + } + rel2 { + relative: 1.0 0.0; + to_x: "elm.icon3.bg"; + to_y: "elm.padding.bottom"; + } + align: 0.0 1.0; + visible: 0; + } + } + part { name: "elm.icon4.bg"; + clip_to: "disclip"; + type: IMAGE; + scale: 1; + description { state: "default" 0.0; + min: GENLIST_SIZE_116_INC GENLIST_SIZE_116_INC; + fixed: 1 1; + rel1 { + relative: 1.0 0.0; + to_x: "elm.padding.icon4.left"; + to_y: "elm.padding.bottom"; + } + rel2 { + relative: 1.0 0.0; + to_x: "elm.padding.icon4.left"; + to_y: "elm.padding.bottom"; + } + align: 0.0 1.0; + image.normal: "00_input_bg.png"; + image.border: 5 5 5 5; + image.border_scale: 1; + } + } + part { name: "elm.icon.4"; + clip_to: "disclip"; + type: SWALLOW; + scale: 1; + description { state: "default" 0.0; + rel1 { + to: "elm.icon4.bg"; + offset: 2 2; + } + rel2 { + to: "elm.icon4.bg"; + offset: -3 -3; + } + align: 0.5 0.5; + } + } + 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"; + } + } + } + group { name: "elm/genlist/item/dialogue/3icon/default"; alias: "elm/genlist/item_odd/dialogue/3icon/default"; alias: "elm/genlist/item_compress/dialogue/3icon/default"; @@ -17474,6 +17809,7 @@ } }*/ + /* DEPRECATED : remove this style. use dialogue/1text.4icon instead. */ group { name: "elm/genlist/item/dialogue/4icon/default"; alias: "elm/genlist/item_odd/dialogue/4icon/default"; alias: "elm/genlist/item_compress/dialogue/4icon/default"; @@ -17486,13 +17822,13 @@ image : "00_input_bg.png" COMP; } parts { - GENLIST_PART_BASE( GENLIST_HEIGHT_206_INC ) + GENLIST_PART_BASE( GENLIST_HEIGHT_207_INC ) GENLIST_PART_BG_IMAGE GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC ) - GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_24_INC ) - GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_32_INC ) - GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC ) + GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_22_INC ) + GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_12_INC ) + GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_74_INC ) GENLIST_PART_DIALOGUE_ITEM part { name: "text"; clip_to: "disclip"; @@ -17532,7 +17868,7 @@ type: RECT; scale: 1; description { state: "default" 0.0; - min: GENLIST_PADDING_106_INC 0; + min: GENLIST_PADDING_74_INC 0; fixed: 1 0; rel1 { relative: 1.0 0.0; @@ -17553,7 +17889,7 @@ type: IMAGE; scale: 1; description { state: "default" 0.0; - min: GENLIST_SIZE_115_INC GENLIST_SIZE_115_INC; + min: GENLIST_SIZE_116_INC GENLIST_SIZE_116_INC; fixed: 1 1; rel1 { relative: 1.0 0.0; @@ -17607,7 +17943,7 @@ type: IMAGE; scale: 1; description { state: "default" 0.0; - min: GENLIST_SIZE_115_INC GENLIST_SIZE_115_INC; + min: GENLIST_SIZE_116_INC GENLIST_SIZE_116_INC; fixed: 1 1; rel1 { relative: 1.0 0.0; @@ -17661,7 +17997,7 @@ type: IMAGE; scale: 1; description { state: "default" 0.0; - min: GENLIST_SIZE_115_INC GENLIST_SIZE_115_INC; + min: GENLIST_SIZE_116_INC GENLIST_SIZE_116_INC; fixed: 1 1; rel1 { relative: 1.0 0.0; @@ -17715,7 +18051,7 @@ type: IMAGE; scale: 1; description { state: "default" 0.0; - min: GENLIST_SIZE_115_INC GENLIST_SIZE_115_INC; + min: GENLIST_SIZE_116_INC GENLIST_SIZE_116_INC; fixed: 1 1; rel1 { relative: 1.0 0.0; -- 2.7.4