From 30825e5a11c75dc6c1315392a3d6d54bde2aa049 Mon Sep 17 00:00:00 2001 From: Jehun Lim Date: Fri, 10 Jul 2015 14:45:45 +0900 Subject: [PATCH] add button and slider edc for recently watched content Change-Id: I15ba76bfa2ae093b6d8d0346a8ae16676e9ae8e9 Signed-off-by: Jehun Lim --- include/define.h | 4 +- include/layout/movie.h | 12 + include/view/base.h | 2 + include/view/viewer.h | 1 - res/edc/images/ic_preview_play.png | Bin 0 -> 11370 bytes res/edc/widgets/button.edc | 564 +++++++++++++++++++++++++++++++++++++ res/edc/widgets/slider.edc | 47 ++++ 7 files changed, 628 insertions(+), 2 deletions(-) create mode 100644 res/edc/images/ic_preview_play.png diff --git a/include/define.h b/include/define.h index 905eaea..dd55262 100644 --- a/include/define.h +++ b/include/define.h @@ -53,7 +53,9 @@ #define PART_ELM_SWALLOW_VIDEO "elm.swallow.video" /* signal */ -#define SIG_ITEM_SELECTED "item_selected" +#define SIG_BTN_CLICKED "btn,clicked" +#define SIG_ITEM_SELECTED "item,selected" #define SIG_SOURCE_EDC "edc" +#define SIG_SOURCE_SRC "src" #endif /* __AIR_MEDIAHUB_DEFINE_H__ */ diff --git a/include/layout/movie.h b/include/layout/movie.h index 5d10efc..640ea4e 100644 --- a/include/layout/movie.h +++ b/include/layout/movie.h @@ -17,13 +17,25 @@ #ifndef __AIR_MEDIAHUB_LAYOUT_MOVIE_H__ #define __AIR_MEDIAHUB_LAYOUT_MOVIE_H__ +/* layout */ #define LAYOUT_MOVIE "LAYOUT_MOVIE" +/* group */ #define GRP_MOVIE_LAYOUT "group.movie_layout" +#define GRP_MOVIE_RECENT_CONTENT "group.movie_recent_content" +/* part */ #define PART_CONTENT "part.content" #define PART_NOCONTENT "part.nocontent" +#define PART_RECENT_CONTENT_THUMBNAIL "part.recent_content_thumbnail" +#define PART_RECENT_CONTENT_TITLE "part.recent_content_title" +#define PART_RECENT_CONTENT_DATE "part.recent_content_date" +#define PART_RECENT_CONTENT_PROGRESS "part.recent_content_progress" +#define PART_RECENT_CONTENT_TOTAL "part.recent_content_total" +#define PART_RECENT_CONTENT_SLIDER "part.recent_content_slider" +/* style */ #define STYLE_GRID_MOVIE_ITEM "movie_item" +#define STYLE_BTN_RECENT_CONTENT "base_btn_recent" #endif /* __AIR_MEDIAHUB_LAYOUT_MOVIE_H__ */ diff --git a/include/view/base.h b/include/view/base.h index a40dd4e..aa909e6 100644 --- a/include/view/base.h +++ b/include/view/base.h @@ -34,10 +34,12 @@ #define PART_ITEM_CONTENT "part.item_content" /* images */ +#define IMAGE_PREVIEW_PLAY "ic_preview_play.png" #define IMAGE_THUMBNAIL_PLAY IMAGEDIR"/ic_thumbnail_play.png" /* style */ #define STYLE_BTN_MENU "base_btn_menu" #define STYLE_BTN_INDEX "base_btn_index" +#define STYLE_BASE_PROGRESS "base_recent_progress" #endif /* __AIR_MEDIAHUB_VIEW_BASE_H__ */ diff --git a/include/view/viewer.h b/include/view/viewer.h index 580e287..d3d494e 100644 --- a/include/view/viewer.h +++ b/include/view/viewer.h @@ -40,7 +40,6 @@ /* signal */ #define SIG_SET_PLAY "set,play,icon" #define SIG_SET_PAUSE "set,pause,icon" -#define SIG_BTN_CLICKED "btn,clicked" #define SIG_BTN_CALLBACK "btn,callback" #define SIG_HIDE_BAR "hide,bar" #define SIG_SHOW_BAR "show,bar" diff --git a/res/edc/images/ic_preview_play.png b/res/edc/images/ic_preview_play.png new file mode 100644 index 0000000000000000000000000000000000000000..2c20b3e7bfb5fea52e5ea82306295aad208a7cff GIT binary patch literal 11370 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

cOIfAJr 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 literal 0 HcmV?d00001 diff --git a/res/edc/widgets/button.edc b/res/edc/widgets/button.edc index 27bbf34..ae8ef37 100644 --- a/res/edc/widgets/button.edc +++ b/res/edc/widgets/button.edc @@ -591,3 +591,567 @@ group { } } } + +group { + name: "elm/button/base/base_btn_recent"; + data.item, "focus_highlight" "on"; + images { + image: IMAGE_PREVIEW_PLAY COMP; + } + parts { + part { + name: "bg"; + scale: 1; + description { + state: "default" 0.0; + min: 740 614; + } + } + part { + name: "map"; + type: RECT; + scale: 1; + description { + state: "default" 0.0; + perspective { + zplane: 0; + focal: 1000; + } + visible: 0; + } + description { + state: "selected" 0.0; + inherit: "default" 0.0; + perspective.zplane: -100; + } + } + part { + name: PART_RECENT_CONTENT_THUMBNAIL; + type: SWALLOW; + scale: 1; + description { + state: "default" 0.0; + rel1.to: "bg"; + rel2 { + to: "bg_text"; + relative: 1.0 0.0; + } + map { + perspective_on: 1; + perspective: "map"; + } + } + description { + state: "selected" 0.0; + inherit: "default" 0.0; + map.on: 1; + } + } + part { + name: "default_image"; + type: IMAGE; + scale: 1; + description { + state: "default" 0.0; + rel1 { + to: PART_RECENT_CONTENT_THUMBNAIL; + relative: 0.5 0.5; + } + rel2 { + to: PART_RECENT_CONTENT_THUMBNAIL; + relative: 0.5 0.5; + } + image.normal: IMAGE_PREVIEW_PLAY; + min: 120 120; + fixed: 1 1; + map { + perspective_on: 1; + perspective: "map"; + } + } + description { + state: "selected" 0.0; + inherit: "default" 0.0; + map.on: 1; + } + } + part { + name: "part_focus1"; + type: RECT; + mouse_events: 0; + scale: 1; + description { + state: "default" 0.0; + rel1.to: "bg"; + rel2 { + to: "bg"; + relative: 1.0 0.0; + } + min: 0 6; + align: 0.5 0.0; + color: COLOR_ITEM_FOCUS; + fixed: 0 1; + visible: 0; + map { + perspective_on: 1; + perspective: "map"; + } + } + description { + state: "selected" 0.0; + inherit: "default" 0.0; + map.on: 1; + visible: 1; + } + description { + state: "selected_0" 0.0; + inherit: "default" 0.0; + visible: 1; + color: COLOR_ITEM_FOCUS_0; + } + } + part { + name: "part_focus2"; + type: RECT; + mouse_events: 0; + scale: 1; + description { + state: "default" 0.0; + rel1 { + to: "part_focus1"; + relative: 0.0 1.0; + } + rel2 { + to: "bg_text"; + relative: 0.0 0.0; + } + min: 6 0; + align: 0.0 0.5; + color: COLOR_ITEM_FOCUS; + fixed: 1 0; + visible: 0; + map { + perspective_on: 1; + perspective: "map"; + } + } + description { + state: "selected" 0.0; + inherit: "default" 0.0; + map.on: 1; + visible: 1; + } + description { + state: "selected_0" 0.0; + inherit: "default" 0.0; + visible: 1; + color: COLOR_ITEM_FOCUS_0; + } + } + part { + name: "part_focus3"; + type: RECT; + mouse_events: 0; + scale: 1; + description { + state: "default" 0.0; + rel1 { + to: "part_focus1"; + relative: 1.0 1.0; + } + rel2 { + to: "bg_text"; + relative: 1.0 0.0; + } + min: 6 0; + align: 1.0 0.5; + color: COLOR_ITEM_FOCUS; + fixed: 1 0; + visible: 0; + map { + perspective_on: 1; + perspective: "map"; + } + } + description { + state: "selected" 0.0; + inherit: "default" 0.0; + map.on: 1; + visible: 1; + } + description { + state: "selected_0" 0.0; + inherit: "default" 0.0; + visible: 1; + color: COLOR_ITEM_FOCUS_0; + } + } + part { + name: "defaultbg_text"; + type: RECT; + scale: 1; + description { + state: "default" 0.0; + rel1 { + to: "bg"; + relative: 0.0 1.0; + } + rel2.to: "bg"; + min: 0 198; + align: 0.5 1.0; + color: COLOR_ITEM_BG; + fixed: 0 1; + map { + perspective_on: 1; + perspective: "map"; + } + } + description { + state: "selected" 0.0; + inherit: "default" 0.0; + color: COLOR_ITEM_FOCUS; + map.on: 1; + } + } + part { + name: "bg_text"; + type: RECT; + scale: 1; + description { + state: "default" 0.0; + rel1.to: "defaultbg_text"; + rel2.to: "defaultbg_text"; + color: COLOR_ITEM_BG; + map { + perspective_on: 1; + perspective: "map"; + } + } + description { + state: "selected" 0.0; + inherit: "default" 0.0; + color: COLOR_ITEM_FOCUS; + map.on: 1; + } + description { + state: "selected_0" 0.0; + inherit: "default" 0.0; + color: COLOR_ITEM_FOCUS_0; + } + } + part { + name: "padding_text_left"; + type: SPACER; + scale: 1; + description { + state: "default" 0.0; + rel1.to: "bg_text"; + rel2 { + to: "bg_text"; + relative: 0.0 0.0; + } + min: 26 28; + align: 0.0 0.0; + fixed: 1 1; + } + } + part { + name: "padding_text_right"; + type: SPACER; + scale: 1; + description { + state: "default" 0.0; + rel1 { + to: "bg_text"; + relative: 1.0 0.0; + } + rel2 { + to: "bg_text"; + relative: 1.0 0.0; + } + min: 26 28; + align: 1.0 0.0; + fixed: 1 1; + } + } + part { + name: PART_RECENT_CONTENT_TITLE; + type: TEXT; + scale: 1; + description { + state: "default" 0.0; + rel1 { + to: "padding_text_left"; + relative: 1.0 1.0; + } + rel2 { + to: "padding_text_right"; + relative: 0.0 1.0; + } + text { + font: FONT_LIGHT; + size: 36; + align: 0.0 0.5; + } + min: 0 36; + align: 0.5 0.0; + color: COLOR_TEXT_FOCUS; + fixed: 0 1; + map { + perspective_on: 1; + perspective: "map"; + } + } + description { + state: "selected" 0.0; + inherit: "default" 0.0; + map.on: 1; + } + description { + state: "selected_0" 0.0; + inherit: "selected" 0.0; + } + } + part { + name: "padding_text_date"; + type: SPACER; + scale: 1; + description { + state: "default" 0.0; + rel1 { + to: PART_RECENT_CONTENT_TITLE; + relative: 0.0 1.0; + } + rel2.to: PART_RECENT_CONTENT_TITLE; + min: 0 12; + align: 0.5 0.0; + fixed: 0 1; + } + } + part { + name: PART_RECENT_CONTENT_DATE; + type: TEXT; + scale: 1; + description { + state: "default" 0.0; + rel1 { + to: "padding_text_date"; + relative: 0.0 1.0; + } + rel2.to: "padding_text_date"; + text { + font: FONT_LIGHT; + size: 28; + align: 0.0 0.5; + } + min: 0 28; + align: 0.5 0.0; + color: COLOR_TEXT_FOCUS; + fixed: 0 1; + map { + perspective_on: 1; + perspective: "map"; + } + } + description { + state: "selected" 0.0; + inherit: "default" 0.0; + map.on: 1; + } + description { + state: "selected_0" 0.0; + inherit: "selected" 0.0; + } + } + part { + name: "padding_text_time"; + type: SPACER; + scale: 1; + description { + state: "default" 0.0; + rel1 { + to: PART_RECENT_CONTENT_DATE; + relative: 0.0 1.0; + } + rel2.to: PART_RECENT_CONTENT_DATE; + min: 0 34; + align: 0.5 0.0; + fixed: 0 1; + } + } + part { + name: PART_RECENT_CONTENT_PROGRESS; + type: TEXT; + scale: 1; + description { + state: "default" 0.0; + rel1 { + to: "padding_text_time"; + relative: 0.0 1.0; + } + rel2 { + to: "padding_text_time"; + relative: 0.0 1.0; + } + text { + font: TEXT_LIGHT; + size: 20; + align: 0.0 0.5; + } + min: 100 20; + align: 0.0 0.0; + fixed: 1 1; + } + } + part { + name: PART_RECENT_CONTENT_TOTAL; + type: TEXT; + scale: 1; + description { + state: "default" 0.0; + rel1 { + to: "padding_text_time"; + relative: 1.0 1.0; + } + rel2.to: "padding_text_time"; + text { + font: TEXT_LIGHT; + size: 20; + align: 1.0 0.5; + } + min: 100 20; + align: 1.0 0.0; + fixed: 1 1; + } + } + part { + name: "padding_slider"; + type: SPACER; + scale: 1; + description { + state: "default" 0.0; + rel1 { + to: PART_RECENT_CONTENT_PROGRESS; + relative: 0.0 1.0; + } + rel2.to: PART_RECENT_CONTENT_TOTAL; + min: 0 10; + align: 0.5 0.0; + fixed: 0 1; + } + } + part { + name: PART_RECENT_CONTENT_SLIDER; + type: SWALLOW; + scale: 1; + description { + state: "default" 0.0; + rel1 { + to: "padding_slider"; + relative: 0.0 1.0; + } + rel2.to: "padding_slider"; + min: 0 30; + align: 0.5 0.0; + fixed: 0 1; + } + } + part { + name: "event"; + type: RECT; + scale: 1; + description { + state: "default" 0.0; + visible: 0; + } + } + } + programs { + program { + name: "go_active"; + signal: "elm,action,focus"; + source: "elm"; + action: STATE_SET "selected_0" 0.0; + target: "part_focus1"; + target: "part_focus2"; + target: "part_focus3"; + target: "bg_text"; + target: PART_RECENT_CONTENT_TITLE; + target: PART_RECENT_CONTENT_DATE; + after: "focus,in,anim"; + } + program { + name: "focus,in,anim"; + action: STATE_SET "selected" 0.0; + target: PART_RECENT_CONTENT_THUMBNAIL; + target: "default_image"; + target: "part_focus1"; + target: "part_focus2"; + target: "part_focus3"; + target: "bg_text"; + transition: LINEAR 0.17; + after: "focus,in,anim,2"; + } + program { + name: "focus,in,anim,2"; + action: STATE_SET "selected" 0.0; + target: "defaultbg_text"; + } + program { + name: "go_passive"; + signal: "elm,action,unfocus"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: PART_RECENT_CONTENT_TITLE; + target: PART_RECENT_CONTENT_DATE; + target: "defaultbg_text"; + after: "focus,out,anim"; + } + program { + name: "focus,out,anim"; + action: STATE_SET "selected_0" 0.0; + target: "part_focus1"; + target: "part_focus2"; + target: "part_focus3"; + target: "bg_text"; + transition: LINEAR 0.17; + after: "focus,out,anim,2"; + } + program { + name: "focus,out,anim,2"; + action: STATE_SET "default" 0.0; + target: PART_RECENT_CONTENT_THUMBNAIL; + target: "default_image"; + target: "part_focus1"; + target: "part_focus2"; + target: "part_focus3"; + target: "bg_text"; + } + program { + name: "button_clicked"; + signal: "mouse,clicked,1"; + source: "event"; + action: SIGNAL_EMIT "elm,action,click" ""; + } + program { + name: SIG_BTN_CLICKED; + signal: SIG_BTN_CLICKED; + source: SIG_SOURCE_SRC; + action: STATE_SET "selected" 0.0; + target: "map"; + transition: DECELERATE 0.2; + after: "after_selected"; + } + program { + name: "after_selected"; + action: STATE_SET "default" 0.0; + target: "map"; + transition: DECELERATE 0.2; + after: "item_selected"; + } + program { + name: "item_selected"; + action: SIGNAL_EMIT SIG_ITEM_SELECTED SIG_SOURCE_EDC; + } + } +} diff --git a/res/edc/widgets/slider.edc b/res/edc/widgets/slider.edc index 2e0e34c..61a89a4 100644 --- a/res/edc/widgets/slider.edc +++ b/res/edc/widgets/slider.edc @@ -194,6 +194,53 @@ group { } group { + name: "elm/slider/horizontal/base_recent_progress"; + inherit: "elm/slider/horizontal/viewer_progress"; + parts { + part { + name: "base"; + scale: 1; + type: RECT; + description { + state: "default" 0.0; + rel1 { + to: "bg"; + relative: 0.0 0.0; + } + rel2 { + to: "bg"; + relative: 1.0 0.0; + } + min: 0 4; + fixed: 0 1; + align: 0.0 0.0; + color: 255 255 255 51; + } + } + part { + name: "glow"; + mouse_events: 0; + scale: 1; + type: RECT; + description { + state: "default" 0.0; + rel1.to: "base"; + rel2 { + relative: 0.5 1.0; + to_x: "button"; + to_y: "base"; + } + min: 0 4; + max: 99999 4; + fixed: 0 1; + align: 0.0 1.0; + color: COLOR_TEXT_FOCUS; + } + } + } +} + +group { name: "elm/slider/horizontal/progress_indicator/default"; alias: "elm/slider/horizontal/popup/default"; parts { -- 2.7.4