From a8a7aba3bda98a3d4a7ad695578627e33b3ba4a8 Mon Sep 17 00:00:00 2001 From: Hyoyoung Chang Date: Mon, 20 Feb 2012 10:24:53 +0900 Subject: [PATCH] [bubble] add time field and buttons --- themes/inc/tizen-black-hd-inc.edc | 1 + themes/inc/tizen-black-inc.edc | 1 + themes/inc/tizen-hd-inc.edc | 1 + themes/inc/tizen-inc.edc | 1 + themes/widgets/bubble.edc | 175 +++++++++++++++++++++------ themes/widgets/entry.edc | 244 +++++++++++++++++++++++++++++++++++++- 6 files changed, 382 insertions(+), 41 deletions(-) diff --git a/themes/inc/tizen-black-hd-inc.edc b/themes/inc/tizen-black-hd-inc.edc index e579043..5e14ee9 100644 --- a/themes/inc/tizen-black-hd-inc.edc +++ b/themes/inc/tizen-black-hd-inc.edc @@ -143,6 +143,7 @@ #define GENLIST_PADDING_48_INC 48 #define GENLIST_PADDING_64_INC 64 #define GENLIST_PADDING_74_INC 74 +#define GENLIST_PADDING_88_INC 88 #define GENLIST_FONT_27_INC 27 #define GENLIST_FONT_28_INC 28 diff --git a/themes/inc/tizen-black-inc.edc b/themes/inc/tizen-black-inc.edc index 323d556..1007fa8 100644 --- a/themes/inc/tizen-black-inc.edc +++ b/themes/inc/tizen-black-inc.edc @@ -140,6 +140,7 @@ #define GENLIST_PADDING_48_INC 30 #define GENLIST_PADDING_64_INC 40 #define GENLIST_PADDING_74_INC 46 +#define GENLIST_PADDING_88_INC 55 #define GENLIST_FONT_27_INC 17 #define GENLIST_FONT_28_INC 18 diff --git a/themes/inc/tizen-hd-inc.edc b/themes/inc/tizen-hd-inc.edc index 24d88aa..7fde6de 100644 --- a/themes/inc/tizen-hd-inc.edc +++ b/themes/inc/tizen-hd-inc.edc @@ -143,6 +143,7 @@ #define GENLIST_PADDING_48_INC 48 #define GENLIST_PADDING_64_INC 64 #define GENLIST_PADDING_74_INC 74 +#define GENLIST_PADDING_88_INC 88 #define GENLIST_FONT_27_INC 27 #define GENLIST_FONT_28_INC 28 diff --git a/themes/inc/tizen-inc.edc b/themes/inc/tizen-inc.edc index 6642480..f192b10 100644 --- a/themes/inc/tizen-inc.edc +++ b/themes/inc/tizen-inc.edc @@ -140,6 +140,7 @@ #define GENLIST_PADDING_48_INC 30 #define GENLIST_PADDING_64_INC 40 #define GENLIST_PADDING_74_INC 46 +#define GENLIST_PADDING_88_INC 55 #define GENLIST_FONT_27_INC 17 #define GENLIST_FONT_28_INC 18 diff --git a/themes/widgets/bubble.edc b/themes/widgets/bubble.edc index 5d713a3..f11d790 100644 --- a/themes/widgets/bubble.edc +++ b/themes/widgets/bubble.edc @@ -655,38 +655,67 @@ group { } } } - part { name: "elm.swallow.button1"; + part { name: "elm.padding.contents"; + type: RECT; + scale: 1; + description { state: "default" 0.0; + align: 0.0 0.0; + fixed: 1 1; + visible: 0; + rel1 { relative: 0.0 1.0; to_y: "elm.icon"; } + rel2 { relative: 1.0 1.0; to_y: "elm.icon"; } + } + } + part { name: "elm.swallow.icon1"; clip_to: "disclip"; type: SWALLOW; scale: 1; description { state: "default" 0.0; - align: 0.0 1.0; + min: GENLIST_PADDING_64_INC GENLIST_PADDING_64_INC; + max: GENLIST_PADDING_64_INC GENLIST_PADDING_64_INC; + align: 0.0 0.0; fixed: 1 1; - rel1 { relative: 0.80 0.80; to_y: "elm.icon"; } - rel2 { relative: 0.88 0.95; to_y: "elm.icon"; } + visible: 0; + rel1 { relative: 0.0223 1.00; to_y: "elm.padding.contents"; } + rel2 { relative: 0.0223 1.00; } + } + description { state: "contents_on" 0.0; + inherit: "default" 0.0; + visible: 1; } } - part { name: "elm.swallow.button2"; + part { name: "elm.swallow.icon2"; clip_to: "disclip"; type: SWALLOW; scale: 1; description { state: "default" 0.0; - align: 0.0 1.0; + min: GENLIST_PADDING_64_INC GENLIST_PADDING_64_INC; + max: GENLIST_PADDING_64_INC GENLIST_PADDING_64_INC; + align: 0.0 0.0; fixed: 1 1; - rel1 { relative: 0.89 0.80; to_y: "elm.icon"; } - rel2 { relative: 0.97 0.95; to_y: "elm.icon"; } + visible: 0; + rel1 { relative: 1.0 1.00; to_x: "elm.swallow.icon1"; to_y: "elm.padding.contents"; } + rel2 { relative: 1.0 1.00; } + } + description { state: "contents_on" 0.0; + inherit: "default" 0.0; + visible: 1; } } part { name: "elm.padding.bottom"; - type: RECT; - scale: 1; - description { state: "default" 0.0; - min: 0 GENLIST_PADDING_24_INC; - fixed: 0 1; - visible: 0; - rel1.relative: 0.0 1.0; - align: 0.0 1.0; - } + type: RECT; + scale: 1; + description { state: "default" 0.0; + min: 0 GENLIST_PADDING_24_INC; + fixed: 0 1; + visible: 0; + rel1.relative: 0.0 1.0; + align: 0.0 1.0; + } + description { state: "contents_on" 0.0; + inherit: "default" 0.0; + min: 0 GENLIST_PADDING_88_INC; + } } part { name: "disclip"; type: RECT; @@ -716,7 +745,7 @@ group { source: "elm"; action: STATE_SET "default" 0.0; //transition: DECELERATE 0.7; - target: "elm.swallow.select_icon"; + target: "elm.swallow.select_icon"; target: "elm.icon"; } program { name: "go_selectview"; @@ -727,6 +756,22 @@ group { target: "elm.swallow.select_icon"; target: "elm.icon"; } + program { name: "go_contents_on"; + signal: "elm,state,contents,enabled"; + source: "elm"; + action: STATE_SET "contents_on" 0.0; + target: "elm.swallow.icon1"; + target: "elm.swallow.icon2"; + target: "elm.padding.bottom"; + } + program { name: "go_contents_off"; + signal: "elm,state,contents,disabled"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "elm.swallow.icon1"; + target: "elm.swallow.icon2"; + target: "elm.padding.bottom"; + } } } @@ -816,40 +861,67 @@ group { } } } - part { name: "elm.swallow.button1"; + part { name: "elm.padding.contents"; + type: RECT; + scale: 1; + description { state: "default" 0.0; + align: 0.0 0.0; + fixed: 1 1; + visible: 0; + rel1 { relative: 0.0 1.0; to_y: "elm.icon"; } + rel2 { relative: 1.0 1.0; to_y: "elm.icon"; } + } + } + part { name: "elm.swallow.icon1"; clip_to: "disclip"; type: SWALLOW; scale: 1; description { state: "default" 0.0; - align: 0.0 1.0; + min: GENLIST_PADDING_64_INC GENLIST_PADDING_64_INC; + max: GENLIST_PADDING_64_INC GENLIST_PADDING_64_INC; + align: 1.0 0.0; fixed: 1 1; - max: 40 40; - rel1 { relative: 0.03 0.80; to_y: "elm.icon"; } - rel2 { relative: 0.11 0.95; to_y: "elm.icon"; } + visible: 0; + rel1 { relative: 0.0 1.00; to_x: "elm.swallow.icon2"; to_y: "elm.padding.contents"; } + rel2 { relative: 0.0 1.00; to_x: "elm.swallow.icon2"; } + } + description { state: "contents_on" 0.0; + inherit: "default" 0.0; + visible: 1; } } - part { name: "elm.swallow.button2"; + part { name: "elm.swallow.icon2"; clip_to: "disclip"; type: SWALLOW; scale: 1; description { state: "default" 0.0; - align: 0.0 1.0; + min: GENLIST_PADDING_64_INC GENLIST_PADDING_64_INC; + max: GENLIST_PADDING_64_INC GENLIST_PADDING_64_INC; + align: 1.0 0.0; fixed: 1 1; - max: 40 40; - rel1 { relative: 0.12 0.80; to_y: "elm.icon"; } - rel2 { relative: 0.20 0.95; to_y: "elm.icon"; } + visible: 0; + rel1 { relative: 0.9777 1.00; to_y: "elm.padding.contents"; } + rel2 { relative: 0.9777 1.00; } + } + description { state: "contents_on" 0.0; + inherit: "default" 0.0; + visible: 1; } } part { name: "elm.padding.bottom"; - type: RECT; - scale: 1; - description { state: "default" 0.0; - min: 0 GENLIST_PADDING_24_INC; - fixed: 0 1; - visible: 0; - rel1.relative: 0.0 1.0; - align: 0.0 1.0; - } + type: RECT; + scale: 1; + description { state: "default" 0.0; + min: 0 GENLIST_PADDING_24_INC; + fixed: 0 1; + visible: 0; + rel1.relative: 0.0 1.0; + align: 0.0 1.0; + } + description { state: "contents_on" 0.0; + inherit: "default" 0.0; + min: 0 GENLIST_PADDING_88_INC; + } } part { name: "disclip"; type: RECT; @@ -890,6 +962,35 @@ group { target: "elm.swallow.select_icon"; target: "elm.icon"; } + program { name: "go_contents_on"; + signal: "elm,state,contents,enabled"; + source: "elm"; + action: STATE_SET "contents_on" 0.0; + target: "elm.swallow.icon1"; + target: "elm.swallow.icon2"; + target: "elm.padding.bottom"; + } + program { name: "go_contents_off"; + signal: "elm,state,contents,disabled"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "elm.swallow.icon1"; + target: "elm.swallow.icon2"; + target: "elm.padding.bottom"; + } + } + } + + group { name: "elm/layout/bubble/seperator/default"; + parts { + part { name: "base"; + type: RECT; + repeat_events: 1; + description { state: "default" 0.0; + min: 0 GENLIST_PADDING_24_INC; + color: 0 0 0 0; + } + } } } diff --git a/themes/widgets/entry.edc b/themes/widgets/entry.edc index 69581a0..b696956 100644 --- a/themes/widgets/entry.edc +++ b/themes/widgets/entry.edc @@ -2243,6 +2243,96 @@ group { name: "elm/entry/base-password/popup"; } } part { + name: "elm.rect.status.pad"; + type: RECT; + scale: 1; + description { + state: "default" 0.0; + min: GENLIST_PADDING_6_INC GENLIST_SIZE_64_INC; + fixed: 1 1; + align: 0.0 1.0; + visible: 0; + rel1 { relative: 1.5 1.0; to_x: "elm.rect.right.pad"; to_y: "elm.rect.bottom.pad"; } + rel2 { relative: 1.0 1.0; to_y: "elm.rect.bottom.pad"; } + } + } + part { + name: "elm.rect.time.pad"; + type: RECT; + scale: 1; + description { + state: "default" 0.0; + min: GENLIST_PADDING_6_INC GENLIST_PADDING_34_INC; + max: GENLIST_PADDING_6_INC GENLIST_PADDING_34_INC; + fixed: 1 1; + align: 0.0 0.0; + visible: 0; + rel1.to: "elm.rect.status.pad"; + rel2 { relative: 1.0 1.0; to_y: "elm.rect.bottom.pad"; } + } + } + part { name: "elm.text.status"; + type: TEXT; + scale: 1; + description { state: "default" 0.0; + align: 0.0 1.0; + fixed: 1 1; + text { + font: "SLP:style=Roman"; + size: GENLIST_FONT_28_INC; + min: 1 0; + } + visible: 1; + color: GENLIST_PART_FONT_LIST_SUB_TEXT_COLOR_INC; + rel1 { relative: 0.0 0.0; to_x: "elm.rect.status.pad"; to_y: "elm.rect.status.pad"; } + rel2 { relative: 0.0 0.0; to_x: "elm.rect.status.pad"; to_y: "elm.rect.status.pad"; } + } + description { state: "disabled" 0.0; + inherit: "default" 0.0; + visible: 0; + } + } + part { name: "elm.text.time"; + type: TEXT; + scale: 1; + description { state: "default" 0.0; + align: 0.0 0.0; + fixed: 1 1; + text { + font: "SLP:style=Roman"; + size: GENLIST_FONT_28_INC; + min: 1 0; + } + visible: 1; + color: GENLIST_PART_FONT_LIST_SUB_TEXT_COLOR_INC; + rel1 { relative: 0.0 1.0; to_x: "elm.rect.time.pad"; to_y: "elm.rect.time.pad"; } + rel2 { relative: 0.0 1.0; to_x: "elm.rect.time.pad"; to_y: "elm.rect.time.pad"; } + } + description { state: "disabled" 0.0; + inherit: "default" 0.0; + visible: 0; + } + } + part { + name: "elm.swallow.icon1"; + type: SWALLOW; + scale: 1; + description { + state: "default" 0.0; + min: GENLIST_PADDING_64_INC GENLIST_PADDING_64_INC; + max: GENLIST_PADDING_64_INC GENLIST_PADDING_64_INC; + fixed: 1 1; + align: 0.0 1.0; + visible: 0; + rel1 { relative: 1.5 0.3; to_x: "elm.rect.right.pad"; to_y: "elm.rect.bottom.pad"; } + rel2 { relative: 1.0 0.3; to_y: "elm.rect.bottom.pad"; } + } + description { state: "enabled" 0.0; + inherit: "default" 0.0; + visible: 1; + } + } + part { name: "elm.swallow.end"; type: SWALLOW; scale: 1; @@ -2286,6 +2376,34 @@ group { name: "elm/entry/base-password/popup"; target: "elm.swallow.callerid"; target: "elm.text"; } + program { name: "go_textstatus_on"; + signal: "elm,state,text,status,enabled"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "elm.text.time"; + target: "elm.text.status"; + after: "go_contentstatus_off"; + } + program { name: "go_textstatus_off"; + signal: "elm,state,text,status,disbled"; + source: "elm"; + action: STATE_SET "disabled" 0.0; + target: "elm.text.time"; + target: "elm.text.status"; + } + program { name: "go_contentstatus_on"; + signal: "elm,state,content,status,enabled"; + source: "elm"; + action: STATE_SET "enabled" 0.0; + target: "elm.swallow.icon1"; + after: "go_textstatus_off"; + } + program { name: "go_contentstatus_off"; + signal: "elm,state,content,status,disabled"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "elm.swallow.icon1"; + } } } @@ -2350,11 +2468,11 @@ group { name: "elm/entry/base-password/popup"; rel1.relative: 0.0 1.0; } } - part { + part { name: "elm.image.bg"; type: IMAGE; scale: 1; - description { + description { state: "default" 0.0; rel2.to_x: "elm.rect.right.pad"; image { @@ -2740,6 +2858,96 @@ group { name: "elm/entry/base-password/popup"; } } part { + name: "elm.rect.status.pad"; + type: RECT; + scale: 1; + description { + state: "default" 0.0; + min: GENLIST_PADDING_6_INC GENLIST_SIZE_64_INC; + fixed: 1 1; + align: 1.0 1.0; + visible: 0; + rel1 { relative: -0.8 1.0; to_x: "elm.rect.left.pad"; to_y: "elm.rect.bottom.pad"; } + rel2 { relative: -0.8 1.0; to_x: "elm.rect.left.pad"; to_y: "elm.rect.bottom.pad"; } + } + } + part { + name: "elm.rect.time.pad"; + type: RECT; + scale: 1; + description { + state: "default" 0.0; + min: GENLIST_PADDING_6_INC GENLIST_PADDING_34_INC; + max: GENLIST_PADDING_6_INC GENLIST_PADDING_34_INC; + fixed: 1 1; + align: 0.0 0.0; + visible: 0; + rel1.to: "elm.rect.status.pad"; + rel2 { relative: 0.0 1.0; to_x: "elm.rect.status.pad"; to_y: "elm.rect.bottom.pad"; } + } + } + part { name: "elm.text.status"; + type: TEXT; + scale: 1; + description { state: "default" 0.0; + align: 1.0 1.0; + fixed: 1 1; + text { + font: "SLP:style=Roman"; + size: GENLIST_FONT_28_INC; + min: 1 0; + } + visible: 1; + color: GENLIST_PART_FONT_LIST_SUB_TEXT_COLOR_INC; + rel1 { relative: 0.0 0.0; to_x: "elm.rect.status.pad"; to_y: "elm.rect.status.pad"; } + rel2 { relative: 0.0 0.0; to_x: "elm.rect.status.pad"; to_y: "elm.rect.status.pad"; } + } + description { state: "disabled" 0.0; + inherit: "default" 0.0; + visible: 0; + } + } + part { name: "elm.text.time"; + type: TEXT; + scale: 1; + description { state: "default" 0.0; + align: 1.0 0.0; + fixed: 1 1; + text { + font: "SLP:style=Roman"; + size: GENLIST_FONT_28_INC; + min: 1 0; + } + visible: 1; + color: GENLIST_PART_FONT_LIST_SUB_TEXT_COLOR_INC; + rel1 { relative: 0.0 1.0; to_x: "elm.rect.status.pad"; to_y: "elm.rect.time.pad"; } + rel2 { relative: 0.0 1.0; to_x: "elm.rect.status.pad"; to_y: "elm.rect.time.pad"; } + } + description { state: "disabled" 0.0; + inherit: "default" 0.0; + visible: 0; + } + } + part { + name: "elm.swallow.icon1"; + type: SWALLOW; + scale: 1; + description { + state: "default" 0.0; + min: GENLIST_PADDING_64_INC GENLIST_PADDING_64_INC; + max: GENLIST_PADDING_64_INC GENLIST_PADDING_64_INC; + fixed: 1 1; + align: 1.0 1.0; + visible: 0; + rel1 { relative: -0.8 0.3; to_x: "elm.rect.left.pad"; to_y: "elm.rect.bottom.pad"; } + rel2 { relative: -0.8 0.3; to_x: "elm.rect.left.pad"; to_y: "elm.rect.bottom.pad"; } + } + description { state: "enabled" 0.0; + inherit: "default" 0.0; + visible: 1; + } + } + part { name: "elm.swallow.end"; type: SWALLOW; scale: 1; @@ -2784,6 +2992,34 @@ group { name: "elm/entry/base-password/popup"; target: "elm.swallow.callerid"; target: "elm.text"; } + program { name: "go_textstatus_on"; + signal: "elm,state,text,status,enabled"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "elm.text.time"; + target: "elm.text.status"; + after: "go_contentstatus_off"; + } + program { name: "go_textstatus_off"; + signal: "elm,state,text,status,disbled"; + source: "elm"; + action: STATE_SET "disabled" 0.0; + target: "elm.text.time"; + target: "elm.text.status"; + } + program { name: "go_contentstatus_on"; + signal: "elm,state,content,status,enabled"; + source: "elm"; + action: STATE_SET "enabled" 0.0; + target: "elm.swallow.icon1"; + after: "go_textstatus_off"; + } + program { name: "go_contentstatus_off"; + signal: "elm,state,content,status,disabled"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "elm.swallow.icon1"; + } } } @@ -2848,11 +3084,11 @@ group { name: "elm/entry/base-password/popup"; rel1.relative: 0.0 1.0; } } - part { + part { name: "elm.image.bg"; type: IMAGE; scale: 1; - description { + description { state: "default" 0.0; rel1.to_x: "elm.rect.left.pad"; image { -- 2.7.4