From beea62998d6872fc65ac389d89dfd4a7c445d44c Mon Sep 17 00:00:00 2001 From: amitpatel Date: Fri, 3 Jul 2020 15:25:18 +0530 Subject: [PATCH] Update Video Player main page controls Change-Id: I24f51ab2af2001d310ac52af7dbd03d7a110dd08 Signed-off-by: amitpatel --- playview/res/edje/custom/pv-custom-button.edc | 603 +++++------------ playview/res/edje/custom/pv-custom-define.edc | 2 +- playview/res/edje/custom/pv-custom-image.edc | 4 + .../res/edje/custom/pv-custom-naviframe.edc | 54 +- .../res/edje/images/button/core_icon_back.png | Bin 1214 -> 385 bytes .../res/edje/images/button/icon_more_menu.png | Bin 0 -> 175 bytes .../images/control/T01-2_control_bg_h.png | Bin 2653 -> 3352 bytes .../T01-2_control_circle_icon_next.png | Bin 1758 -> 395 bytes .../T01-2_control_circle_icon_pause.png | Bin 1128 -> 230 bytes .../T01-2_control_circle_icon_play.png | Bin 1406 -> 476 bytes .../T01-2_control_circle_icon_rewind.png | Bin 1741 -> 392 bytes .../function/T01-2_control_icon_mute.png | Bin 1537 -> 802 bytes .../function/T01-2_control_icon_mute_dim.png | Bin 1690 -> 802 bytes .../T01-2_control_icon_mute_press.png | Bin 1661 -> 802 bytes .../T01_2_control_icon_screenmode02.png | Bin 1358 -> 508 bytes .../T01_2_control_icon_screenmode02_dim.png | Bin 1334 -> 508 bytes .../T01_2_control_icon_screenmode02_press.png | Bin 1380 -> 508 bytes .../T01_2_control_icon_screenmode03.png | Bin 2332 -> 567 bytes .../T01_2_control_icon_screenmode03_dim.png | Bin 2340 -> 567 bytes .../T01_2_control_icon_screenmode03_press.png | Bin 2412 -> 567 bytes .../function/T01_2_control_icon_volume.png | Bin 1646 -> 742 bytes .../T01_2_control_icon_volume_dim.png | Bin 1917 -> 742 bytes .../T01_2_control_icon_volume_press.png | Bin 1919 -> 742 bytes .../images/navigation_bg/00_top_bar_empty.png | Bin 0 -> 2063 bytes .../T01_2_control_progress_handle.png | Bin 2985 -> 488 bytes .../T01_2_control_progress_handle_press.png | Bin 3322 -> 832 bytes playview/res/edje/pv-custom-winset.edc | 1 + playview/res/edje/pv-normal-control.edc | 123 ++-- playview/res/edje/pv-normal-main.edc | 34 +- playview/res/edje/pv-progressbar.edc | 90 +-- playview/src/view/vp-play-normal-view.c | 87 ++- playview/src/widget/vp-play-button.c | 21 +- vp-main/res/edje/custom/pv-custom-button.edc | 604 +++++------------- vp-main/res/edje/custom/pv-custom-define.edc | 2 +- vp-main/res/edje/custom/pv-custom-image.edc | 2 + .../res/edje/custom/pv-custom-naviframe.edc | 54 +- .../res/edje/images/button/core_icon_back.png | Bin 1214 -> 385 bytes .../res/edje/images/button/icon_more_menu.png | Bin 0 -> 175 bytes .../images/control/T01-2_control_bg_h.png | Bin 2653 -> 3352 bytes .../T01-2_control_circle_icon_next.png | Bin 1758 -> 395 bytes .../T01-2_control_circle_icon_pause.png | Bin 1128 -> 230 bytes .../T01-2_control_circle_icon_play.png | Bin 1406 -> 476 bytes .../T01-2_control_circle_icon_rewind.png | Bin 1741 -> 392 bytes .../function/T01-2_control_icon_mute.png | Bin 1537 -> 802 bytes .../function/T01-2_control_icon_mute_dim.png | Bin 1690 -> 802 bytes .../T01-2_control_icon_mute_press.png | Bin 1661 -> 802 bytes .../T01_2_control_icon_screenmode02.png | Bin 1358 -> 508 bytes .../T01_2_control_icon_screenmode02_dim.png | Bin 1334 -> 508 bytes .../T01_2_control_icon_screenmode02_press.png | Bin 1380 -> 508 bytes .../T01_2_control_icon_screenmode03.png | Bin 2332 -> 567 bytes .../T01_2_control_icon_screenmode03_dim.png | Bin 2340 -> 567 bytes .../T01_2_control_icon_screenmode03_press.png | Bin 2412 -> 567 bytes .../function/T01_2_control_icon_volume.png | Bin 1646 -> 742 bytes .../T01_2_control_icon_volume_dim.png | Bin 1917 -> 742 bytes .../T01_2_control_icon_volume_press.png | Bin 1919 -> 742 bytes .../images/navigation_bg/00_top_bar_empty.png | Bin 0 -> 2063 bytes .../T01_2_control_progress_handle.png | Bin 2985 -> 488 bytes .../T01_2_control_progress_handle_press.png | Bin 3322 -> 832 bytes vp-main/res/edje/pv-custom-winset.edc | 1 + vp-main/res/edje/pv-normal-control.edc | 122 ++-- vp-main/res/edje/pv-normal-main.edc | 34 +- vp-main/res/edje/pv-progressbar.edc | 90 +-- 62 files changed, 771 insertions(+), 1157 deletions(-) create mode 100755 playview/res/edje/images/button/icon_more_menu.png create mode 100755 playview/res/edje/images/navigation_bg/00_top_bar_empty.png create mode 100755 vp-main/res/edje/images/button/icon_more_menu.png create mode 100755 vp-main/res/edje/images/navigation_bg/00_top_bar_empty.png diff --git a/playview/res/edje/custom/pv-custom-button.edc b/playview/res/edje/custom/pv-custom-button.edc index 381da26..bf6fb9c 100755 --- a/playview/res/edje/custom/pv-custom-button.edc +++ b/playview/res/edje/custom/pv-custom-button.edc @@ -18,9 +18,9 @@ #define BUTTON_NAVIFRAME_TITLE_BUTTON_BG_MIN_MAX_INC 63 63 #define BUTTON_NAVIFRAME_TITLE_BUTTON_MIN_MAX_INC 63 63 -#define BUTTON_CUSTOM_ICON_NORMAL_COLOR 236 234 226 255 -#define BUTTON_CUSTOM_ICON_PRESS_COLOR 64 147 247 255 -#define BUTTON_CUSTOM_ICON_DIM_COLOR 236 234 226 75 +#define BUTTON_CUSTOM_ICON_NORMAL_COLOR 10 14 74 255 +#define BUTTON_CUSTOM_ICON_PRESS_COLOR 43 95 185 255 +#define BUTTON_CUSTOM_ICON_DIM_COLOR 195 202 210 255 #define BUTTON_NAVIFRAME_MORE_BG_MIN_MAX_INC 85 98 #define BUTTON_NAVIFRAME_MORE_DEFAULT_IMAGE_MIN_MAX_INC 63 63 @@ -156,7 +156,6 @@ group { \ } - group { name: "elm/button/base/custom/circle_1/default"; parts { @@ -165,10 +164,10 @@ group { type: RECT; description { state: "default" 0.0; - rel1.relative: 0.3 0.3; - rel2.relative: 0.7 0.7; - color: 0 166 191 255; + rel1.relative: 0.0 0.0; + rel2.relative: 1.0 1.0; visible: 0; + color: 255 0 0 100; } description { state: "clicked" 0.0; @@ -183,74 +182,6 @@ group { inherit: "default" 0.0; } } - part { - name: "button_bg"; - type: IMAGE; - mouse_events: 0; - description { - state: "default" 0.0; - visible: 1; - rel1.relative: 0 0; - rel2.relative: 1 1; - rel1.to: "button_image"; - rel2.to: "button_image"; - image.normal: "button/T01-2_control_circle_button_01_press.png"; - color: 0 166 191 255; - } - description { - state: "clicked" 0.0; - inherit: "default" 0.0; - image.normal: "button/T01-2_control_circle_button_01_press.png"; - color: 0 166 191 255; - } - description { - state: "disabled" 0.0; - inherit: "default" 0.0; - image.normal: "button/T01-2_control_circle_button_01_press.png"; - color: 0 166 191 255; - } - description { - state: "focused" 0.0; - inherit: "default" 0.0; - image.normal: "button/T01-2_control_circle_button_01_press.png"; - color: 0 166 191 255; - } - } - - part { - name: "button_circle"; - type: IMAGE; - scale: 1; - mouse_events: 0; - description { - state: "default" 0.0; - visible: 1; - rel1.relative: 0 0; - rel2.relative: 1 1; - rel1.to: "button_image"; - rel2.to: "button_image"; - image.normal: "button/T01-2_control_circle_button_01.png"; - color: 0 166 191 255; - } - description { - state: "clicked" 0.0; - inherit: "default" 0.0; - image.normal: "button/T01-2_control_circle_button_01.png"; - color: 0 166 191 255; - } - description { - state: "disabled" 0.0; - inherit: "default" 0.0; - image.normal: "button/T01-2_control_circle_button_01.png"; - color: 0 166 191 255; - } - description { - state: "focused" 0.0; - inherit: "default" 0.0; - image.normal: "button/T01-2_control_circle_button_01_focus.png"; - color: 0 166 191 255; - } - } part { name: "elm.text"; type: TEXT; @@ -277,9 +208,11 @@ group { description { state: "default" 0.0; visible: 1; - rel1.relative: 0 0; + max: 32 32; + min: 32 32; + rel1.relative: 0 0; rel2.relative: 1 1; - rel1.to: "button_image"; + rel1.to: "button_image"; rel2.to: "button_image"; } } @@ -352,6 +285,7 @@ group { action: SIGNAL_EMIT "elm,action,unpress" ""; after: "button_unclick_anim"; } + program { name: "button_unclick_anim"; action: STATE_SET "default" 0.0; @@ -388,23 +322,7 @@ group { //target: "button_bg"; } - /*program { - name: "focused"; - signal: "elm,action,focus"; - source: "elm"; - action: STATE_SET "focused" 0.0; - target: "button_circle"; - target: "button_bg"; - } - program { - name: "unfocused"; - signal: "elm,action,unfocus"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "button_circle"; - target: "button_bg"; - }*/ program { name: "button_clicked"; source: "over2"; @@ -420,12 +338,9 @@ group { part { name: "button_image"; type: RECT; - type: RECT; description { state: "default" 0.0; - rel1.relative: 0.3 0.3; - rel2.relative: 0.7 0.7; - color: 0 255 0 255; + color: 0 0 255 100; visible: 0; } description { @@ -441,75 +356,6 @@ group { inherit: "default" 0.0; } } - part { - name: "button_bg"; - type: IMAGE; - scale: 1; - mouse_events: 0; - description { - state: "default" 0.0; - visible: 1; - rel1.relative: 0 0; - rel2.relative: 1 1; - rel1.to: "button_image"; - rel2.to: "button_image"; - image.normal: "button/T01-2_control_circle_button_01_press.png"; - color: 0 166 191 255; - } - description { - state: "clicked" 0.0; - inherit: "default" 0.0; - image.normal: "button/T01-2_control_circle_button_01_press.png"; - color: 0 166 191 255; - } - description { - state: "disabled" 0.0; - inherit: "default" 0.0; - image.normal: "button/T01-2_control_circle_button_01_press.png"; - color: 0 166 191 255; - } - description { - state: "focused" 0.0; - inherit: "default" 0.0; - image.normal: "button/T01-2_control_circle_button_01_press.png"; - color: 0 166 191 255; - } - } - - part { - name: "button_circle"; - type: IMAGE; - scale: 1; - mouse_events: 0; - description { - state: "default" 0.0; - visible: 1; - rel1.relative: 0 0; - rel2.relative: 1 1; - rel1.to: "button_image"; - rel2.to: "button_image"; - image.normal: "button/T01-2_control_circle_button_01.png"; - color: 0 166 191 255; - } - description { - state: "clicked" 0.0; - inherit: "default" 0.0; - image.normal: "button/T01-2_control_circle_button_01.png"; - color: 0 166 191 255; - } - description { - state: "disabled" 0.0; - inherit: "default" 0.0; - image.normal: "button/T01-2_control_circle_button_01.png"; - color: 0 166 191 255; - } - description { - state: "focused" 0.0; - inherit: "default" 0.0; - image.normal: "button/T01-2_control_circle_button_01.png"; - color: 0 166 191 255; - } - } part { name: "elm.text"; type: TEXT; @@ -531,17 +377,20 @@ group { part { name: "elm.swallow.content"; type: SWALLOW; - scale: 1; + scale: 1; mouse_events: 0; description { state: "default" 0.0; visible: 1; - rel1.relative: 0 0; + max: 32 32; + min: 32 32; + rel1.relative: 0 0; rel2.relative: 1 1; - rel1.to: "button_image"; + rel1.to: "button_image"; rel2.to: "button_image"; } } + part { name: "over2"; type: RECT; @@ -583,10 +432,7 @@ group { state: "disabled" 0.0; inherit: "default" 0.0; visible: 1; - rel1.relative: 0 0; - rel2.relative: 1 1; - rel1.to: "button_image"; - rel2.to: "button_image"; + } } } /* parts */ @@ -603,8 +449,6 @@ group { name: "button_click_anim"; action: STATE_SET "clicked" 0.0; target: "button_image"; - target: "button_circle"; - target: "button_bg"; } program { @@ -618,8 +462,6 @@ group { name: "button_unclick_anim"; action: STATE_SET "default" 0.0; target: "button_image"; - target: "button_circle"; - target: "button_bg"; } program { @@ -636,8 +478,6 @@ group { action: STATE_SET "disabled" 0.0; target: "button_image"; target: "disabler"; - target: "button_circle"; - target: "button_bg"; } program { name: "enable"; @@ -646,27 +486,9 @@ group { action: STATE_SET "default" 0.0; target: "button_image"; target: "disabler"; - target: "button_circle"; - target: "button_bg"; } - program { - name: "focused"; - signal: "elm,action,focus"; - source: "elm"; - action: STATE_SET "focused" 0.0; - target: "button_circle"; - target: "button_bg"; - } - program { - name: "unfocused"; - signal: "elm,action,unfocus"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "button_circle"; - target: "button_bg"; - } program { name: "button_clicked"; source: "over2"; @@ -676,6 +498,9 @@ group { } /* programs */ } + + + group { name: "elm/button/base/custom/circle_2/default"; parts { @@ -684,11 +509,12 @@ group { type: IMAGE; description { state: "default" 0.0; - rel1.relative: 0.8 0.3; - rel2.relative: 1.2 0.7; + rel1.relative: 0.0 0.0; + rel2.relative: 1.0 1.0; + max: 21 24; + min: 21 24; visible: 1; image { normal: "control/T01-2_control_circle_icon_rewind.png";} - color: 0 166 191 255; } description { state: "clicked" 0.0; @@ -703,74 +529,20 @@ group { inherit: "default" 0.0; } } - - /*part { - name: "button_bg"; + part { + name: "button_imageAMIT"; type: IMAGE; - mouse_events: 0; description { state: "default" 0.0; + rel1.relative: 0.0 0.0; + rel2.relative: 1.0 1.0; + max: 21 24; + min: 21 24; visible: 1; - rel1.relative: 0 0; - rel2.relative: 1 1; - rel1.to: "button_image"; - rel2.to: "button_image"; - image.normal: "button/T01-2_control_circle_button_02_press.png"; - color: 0 0 0 153; - } - description { - state: "clicked" 0.0; - inherit: "default" 0.0; - image.normal: "button/T01-2_control_circle_button_02_press.png"; - color: 66 162 207 255; - } - description { - state: "disabled" 0.0; - inherit: "default" 0.0; - image.normal: "button/T01-2_control_circle_button_02_press.png"; - color: 0 0 0 153; - } - description { - state: "focused" 0.0; - inherit: "default" 0.0; - image.normal: "button/T01-2_control_circle_button_02_press.png"; - color: 0 0 0 153; + color: 255 0 0 100; + visible: 1; } } - - part { - name: "button_circle"; - type: IMAGE; - mouse_events: 0; - description { - state: "default" 0.0; - visible: 1; - rel1.relative: 0 0; - rel2.relative: 1 1; - rel1.to: "button_image"; - rel2.to: "button_image"; - image.normal: "button/T01-2_control_circle_button_02.png"; - color: 255 255 255 255 128; - } - description { - state: "clicked" 0.0; - inherit: "default" 0.0; - image.normal: "button/T01-2_control_circle_button_02.png"; - color: 66 162 207 255; - } - description { - state: "disabled" 0.0; - inherit: "default" 0.0; - image.normal: "button/T01-2_control_circle_button_02.png"; - color: 255 255 255 51; - } - description { - state: "focused" 0.0; - inherit: "default" 0.0; - image.normal: "button/T01-2_control_circle_button_02.png"; - color: 255 255 255 255 128; - } - }*/ part { name: "elm.text"; type: TEXT; @@ -788,20 +560,6 @@ group { } } } - /*part { - name: "elm.swallow.content"; - type: SWALLOW; - mouse_events: 0; - description { - state: "default" 0.0; - visible: 1; - rel1.relative: 0 0; - rel2.relative: 1 1; - - rel1.to: "button_image"; - rel2.to: "button_image"; - } - }*/ part { name: "over2"; type: RECT; @@ -893,8 +651,7 @@ group { action: STATE_SET "disabled" 0.0; target: "button_image"; target: "disabler"; - //target: "button_circle"; - //target: "button_bg"; + } program { name: "enable"; @@ -903,22 +660,8 @@ group { action: STATE_SET "default" 0.0; target: "button_image"; target: "disabler"; - //target: "button_circle"; - //target: "button_bg"; - } - /*program { - name: "focused"; - action: STATE_SET "focused" 0.0; - target: "button_circle"; - target: "button_bg"; } - program { - name: "unfocused"; - action: STATE_SET "default" 0.0; - target: "button_circle"; - target: "button_bg"; - }*/ program { name: "button_clicked"; source: "over2"; @@ -937,93 +680,28 @@ group { type: IMAGE; description { state: "default" 0.0; - rel1.relative: -0.2 0.3; - rel2.relative: 0.2 0.7; + rel1.relative: 0.0 0.0; + rel2.relative: 1.0 1.0; + align: 0.5 0.5; + max: 21 24; + min: 21 24; visible: 1; image { normal: "control/T01-2_control_circle_icon_next.png";} - color: 0 166 191 255; - } - description { - state: "clicked" 0.0; - inherit: "default" 0.0; - } - description { - state: "disabled" 0.0; - inherit: "default" 0.0; - } - description { - state: "focused" 0.0; - inherit: "default" 0.0; - } - } - - /*part { - name: "button_bg"; - type: IMAGE; - mouse_events: 0; - description { - state: "default" 0.0; - visible: 1; - rel1.relative: 0 0; - rel2.relative: 1 1; - rel1.to: "button_image"; - rel2.to: "button_image"; - image.normal: "button/T01-2_control_circle_button_02_press.png"; - color: 0 0 0 153; } description { state: "clicked" 0.0; inherit: "default" 0.0; - image.normal: "button/T01-2_control_circle_button_02_press.png"; - color: 66 162 207 255; } description { state: "disabled" 0.0; inherit: "default" 0.0; - image.normal: "button/T01-2_control_circle_button_02_press.png"; - color: 0 0 0 153; } description { state: "focused" 0.0; inherit: "default" 0.0; - image.normal: "button/T01-2_control_circle_button_02_press.png"; - color: 0 0 0 153; } } - part { - name: "button_circle"; - type: IMAGE; - mouse_events: 0; - description { - state: "default" 0.0; - visible: 1; - rel1.relative: 0 0; - rel2.relative: 1 1; - rel1.to: "button_image"; - rel2.to: "button_image"; - image.normal: "button/T01-2_control_circle_button_02.png"; - color: 255 255 255 255 128; - } - description { - state: "clicked" 0.0; - inherit: "default" 0.0; - image.normal: "button/T01-2_control_circle_button_02.png"; - color: 66 162 207 255; - } - description { - state: "disabled" 0.0; - inherit: "default" 0.0; - image.normal: "button/T01-2_control_circle_button_02.png"; - color: 255 255 255 51; - } - description { - state: "focused" 0.0; - inherit: "default" 0.0; - image.normal: "button/T01-2_control_circle_button_02.png"; - color: 255 255 255 255 128; - } - }*/ part { name: "elm.text"; type: TEXT; @@ -1041,20 +719,7 @@ group { } } } - /*part { - name: "elm.swallow.content"; - type: SWALLOW; - mouse_events: 0; - description { - state: "default" 0.0; - visible: 1; - rel1.relative: 0 0; - rel2.relative: 1 1; - - rel1.to: "button_image"; - rel2.to: "button_image"; - } - }*/ + part { name: "over2"; type: RECT; @@ -1113,8 +778,6 @@ group { name: "button_click_anim"; action: STATE_SET "clicked" 0.0; target: "button_image"; - //target: "button_circle"; - //target: "button_bg"; } program { @@ -1128,8 +791,7 @@ group { name: "button_unclick_anim"; action: STATE_SET "default" 0.0; target: "button_image"; - //target: "button_circle"; - //target: "button_bg"; + } program { @@ -1146,8 +808,7 @@ group { action: STATE_SET "disabled" 0.0; target: "button_image"; target: "disabler"; - //target: "button_circle"; - //target: "button_bg"; + } program { name: "enable"; @@ -1156,22 +817,9 @@ group { action: STATE_SET "default" 0.0; target: "button_image"; target: "disabler"; - //target: "button_circle"; - //target: "button_bg"; - } - /*program { - name: "focused"; - action: STATE_SET "focused" 0.0; - target: "button_circle"; - target: "button_bg"; + } - program { - name: "unfocused"; - action: STATE_SET "default" 0.0; - target: "button_circle"; - target: "button_bg"; - }*/ program { name: "button_clicked"; source: "over2"; @@ -2823,11 +2471,8 @@ group { name: "button_image"; type: RECT; scale: 1; - - description { + description { state: "default" 0.0; - rel1.relative:0.0 0.0; - rel2.relative:0.95 1.0; color:255 0 0 255; visible: 0; } @@ -2852,11 +2497,11 @@ group { description { state: "default" 0.0; visible: 1; - min: 26 26; - max: 26 26; - //fixed: 1 1; - rel1 - { relative: 0.0 0.0; to:"button_image";} + min: 28 25; + max: 28 25; + align: 0.5 0.5; + rel1 + {relative: 0.0 0.0; to:"button_image"; } rel2 {relative: 1.0 1.0; to:"button_image"; } } @@ -2874,11 +2519,13 @@ group { description { state: "default" 0.0; visible: 0; - min: 26 26; - max: 26 26; - fixed: 1 1; - rel1.to: "button_image"; - rel2.to: "button_image"; + min: 28 25; + max: 28 25; + align: 0.5 0.5; + rel1 + { relative: 0.0 0.0; to:"button_image"; } + rel2 + {relative: 1.0 1.0; to:"button_image"; } } description { state: "show" 0.0; @@ -2894,11 +2541,13 @@ group { description { state: "default" 0.0; visible: 0; - min: 26 26; - max: 26 26; - fixed: 1 1; - rel1.to: "button_image"; - rel2.to: "button_image"; + min: 28 25; + max: 28 25; + align: 0.5 0.5; + rel1 + { relative: 0.0 0.0; to:"button_image"; } + rel2 + {relative: 1.0 1.0; to:"button_image"; } } description { state: "show" 0.0; @@ -3044,11 +2693,9 @@ group { parts { part { name: "button_image"; - type: RECT; + type: RECT; description { state: "default" 0.0; - //rel1.relative:0.7 0.0; - //rel2.relative:1.0 1.0; color:0 0 255 255; visible: 0; } @@ -3073,13 +2720,13 @@ group { description { state: "default" 0.0; visible: 1; - min: 26 26; - max: 26 26; - //fixed: 1 1; - rel1 - { relative: 0.0 0.0; to:"button_image";} + min: 32 26; + max: 32 26; + fixed: 1 1; + rel1 + {relative: 0.0 0.0; to:"button_image";} rel2 - {relative: 1.0 1.0; to:"button_image"; } + {relative: 1.0 1.0; to:"button_image";} } description { state: "hide" 0.0; @@ -3095,11 +2742,13 @@ group { description { state: "default" 0.0; visible: 0; - min: 26 26; - max: 26 26; + min: 32 26; + max: 32 26; fixed: 1 1; - rel1.to: "button_image"; - rel2.to: "button_image"; + rel1 + {relative: 0.0 0.0; to:"button_image";} + rel2 + {relative: 1.0 1.0; to:"button_image";} } description { state: "show" 0.0; @@ -3115,11 +2764,13 @@ group { description { state: "default" 0.0; visible: 0; - min: 26 26; - max: 26 26; + min: 32 26; + max: 32 26; fixed: 1 1; - rel1.to: "button_image"; - rel2.to: "button_image"; + rel1 + {relative: 0.0 0.0; to:"button_image";} + rel2 + {relative: 1.0 1.0; to:"button_image";} } description { state: "show" 0.0; @@ -4410,28 +4061,35 @@ group { part { name: "bg"; type: RECT; + scale: 1; mouse_events: 1; description { state: "default" 0.0; - color: 0 0 0 0; - min: 80 80; - max: 80 80; + min: 48 48; + max: 48 48; + visible: 0; + color: 0 0 0 0; } } part { name: "icon"; type: IMAGE; mouse_events: 1; + scale: 1; description { state: "default" 0.0; rel1 { - relative: 0 0; + relative: 0.5 0.5; to: "bg"; } rel2 { - relative: 1 1; + relative: 0.5 0.5; to: "bg"; } + align: 0.5 0.5; + min: 11 18; + max: 11 18; + fixed: 1 1; image { normal: "button/core_icon_back.png"; } @@ -4464,6 +4122,75 @@ group { action: RUN_PLUGIN "touch_sound_plugin"; } } - } +group { + name: "elm/button/base/more_menu"; + images + { + image: "button/icon_more_menu.png" COMP; + } + parts { + part { + name: "bg"; + type: RECT; + mouse_events: 1; + description { + state: "default" 0.0; + color: 0 0 0 0; + min: 48 48; + max: 48 48; + } + } + part { + name: "icon"; + type: IMAGE; + mouse_events: 1; + scale: 1; + description { + state: "default" 0.0; + min: 6 24; + max: 6 24; + align: 0.5 0.5; + fixed: 1 0; + rel1 { + relative: 0.0 0.0; + to: "bg"; + } + rel2 { + relative: 1.0 1.0; + to: "bg"; + } + image { + normal: "button/icon_more_menu.png"; + } + } + } + } /*parts*/ + programs { + program { + name: "buttonclicked"; + signal: "mouse,clicked,1"; + source: "bg"; + action: SIGNAL_EMIT "elm,action,click" ""; + } + program { + name: "buttontextclicked"; + signal: "mouse,clicked,1"; + source: "icon"; + action: SIGNAL_EMIT "elm,action,click" ""; + } + program{ + name: "touch_snd"; + source: "bg"; + signal: "mouse,clicked,1"; + action: RUN_PLUGIN "touch_sound_plugin"; + } + program{ + name: "touch_snd1"; + source: "icon"; + signal: "mouse,clicked,1"; + action: RUN_PLUGIN "touch_sound_plugin"; + } + } +} diff --git a/playview/res/edje/custom/pv-custom-define.edc b/playview/res/edje/custom/pv-custom-define.edc index 6d43fee..e475a3d 100755 --- a/playview/res/edje/custom/pv-custom-define.edc +++ b/playview/res/edje/custom/pv-custom-define.edc @@ -19,5 +19,5 @@ #define VIDEO_TITLE_FONT_STYLE "Tizen:style=Medium" #define VIDEO_TITLE_FONT_SIZE 40 #define VIDEO_TITLE_FONT_DEFAULT_COLOR 255 255 255 204 - +#define CURRENT_BASE_SCALE 1.8 diff --git a/playview/res/edje/custom/pv-custom-image.edc b/playview/res/edje/custom/pv-custom-image.edc index 48b3805..45ae862 100755 --- a/playview/res/edje/custom/pv-custom-image.edc +++ b/playview/res/edje/custom/pv-custom-image.edc @@ -16,6 +16,8 @@ images { + image: "navigation_bg/00_top_bar_empty.png" COMP; + /* multi window */ image: "multi/T01_2_mw_control_bg_left.png" COMP; image: "multi/T01_2_mw_control_bg_left_press.png" COMP; @@ -43,6 +45,8 @@ images image: "button/T01-2_control_circle_button_03.png" COMP; image: "button/T01-2_control_circle_button_03_press.png" COMP; image: "button/core_icon_back.png" COMP; + image: "button/icon_more_menu.png" COMP; + image: "control/T01-2_control_circle_icon_rewind.png" COMP; image: "control/T01-2_control_circle_icon_next.png" COMP; /*genlist*/ diff --git a/playview/res/edje/custom/pv-custom-naviframe.edc b/playview/res/edje/custom/pv-custom-naviframe.edc index 98f6e08..334253f 100755 --- a/playview/res/edje/custom/pv-custom-naviframe.edc +++ b/playview/res/edje/custom/pv-custom-naviframe.edc @@ -17,17 +17,17 @@ #define NAVIFRAME_TITLE_BG_COLOR_INC 0 0 0 0 #define NAVIFRAME_TOOLBAR_BG_COLOR_INC 0 0 0 0 -#define NAVIFRAME_TITLE_TOP_PADDING_INC 0 16 -#define NAVIFRAME_TITLE_H_INC 50 +#define NAVIFRAME_TITLE_TOP_PADDING_INC 0 16 +#define NAVIFRAME_TITLE_H_INC 80 #define NAVIFRAME_TOOLBAR_HEIGHT_INC 0 -#define NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC 63 63 +#define NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC 48 48 #define NAVIFRAME_PADDING_INC 20 0 -#define NAVIFRAME_PADDING2_INC 6 0 +#define NAVIFRAME_PADDING2_INC 20 0 #define NAVIFRAME_PADDING3_INC 8 0 -#define NAVIFRAME_BOTTOM_TEXT_PADDING_INC 0 11 -#define NAVIFRAME_BOTTOM_RIGHT_PADDING_INC 26 11 +#define NAVIFRAME_BOTTOM_TEXT_PADDING_INC 0 16 +#define NAVIFRAME_BOTTOM_RIGHT_PADDING_INC 20 16 #define NAVIFRAME_BOTTOM_PADDING_INC 0 10 #define NAVIFRAME_VIEW_TRANS_TIME 0.3 @@ -41,9 +41,19 @@ #define NAVIFRAME_TAG_HEIGHT 192 +styles { + style { name: "title_default_text"; + base: "font=Tizen:weight=Regular:width=BreezeSans align=center color=#000C2B font_size=26"; + } +} + group { name:"elm/naviframe/item/playview/basic/default"; alias:"elm/naviframe/item/playview/1line/default"; + images + { + image: "navigation_bg/00_top_bar_empty.png" COMP; + } script { public tbar_bg = 0; //Toolbar BG Show call count public buttons_visible = 0; //when both buttons are visible @@ -98,7 +108,7 @@ group { part { name: "title_bg"; - type: RECT; + type: IMAGE; scale: 1; description { state: "default" 0.0; @@ -108,7 +118,7 @@ group { visible: 1; rel1 { relative: 0.0 0.0; to: "title_swallow"; } rel2 { relative: 1.0 0.0; to: "title_swallow"; } - color: NAVIFRAME_TITLE_BG_COLOR_INC; + image { normal: "navigation_bg/00_top_bar_empty.png"; } } /* description { @@ -190,7 +200,7 @@ group { scale: 1; description { state: "default" 0.0; - min: 45 0; + min: 76 0; fixed: 1 0; align: 0.0 0.5; rel1 { relative: 0.0 0.0; to: "title_bg"; } @@ -211,14 +221,6 @@ group { // _NATIVE_BUFFER_SYNC rel1 { relative: 0.0 0.0; to: "base"; } rel2 { relative: 1.0 1.0; to: "base"; } - /* - rel1.relative: 0.0 1.0; - rel1.to_x: "base"; - rel1.to_y: "title_bg"; - rel2.relative: 1.0 0.0; - rel2.to_x: "base"; - rel2.to_y: "toolbar_bg"; - */ } description { state: "sip_visible" 0.0; @@ -244,7 +246,7 @@ group { scale: 1; description { state: "default" 0.0; - min: 45 0; + min: 88 0; fixed: 1 0; align: 1.0 0.5; rel1 { relative: 1.0 0.0; to: "title_bg"; } @@ -269,8 +271,7 @@ group { } part { name: "elm.text.title"; - type: TEXT; - effect: FAR_SHADOW BOTTOM; + type: TEXTBLOCK; scale: 1; repeat_events: 1; clip_to: "title_clip"; @@ -279,14 +280,13 @@ group { text { min: 0 0; max: 1 0; - size: 18; + style: title_default_text; } /* chageable GUI color: VIDEO_TITLE_FONT_DEFAULT_COLOR; color3: 0 0 0 255; align: 0.5 0.5; */ - color: 240 240 240 255; fixed: 1 1; rel1 { relative: 1.0 1.0; to_x: "padding_center_text1"; to_y: "top_padding"; } @@ -381,12 +381,12 @@ group { max: NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC; fixed: 1 1; align: 0.0 0.5; - rel1 { relative: 0.5 0.0; to: "title_btns_padding"; } - rel2 { relative: 0.5 1.0; to: "title_btns_padding"; } + rel1 { relative: 1.0 0.0; to: "title_btns_padding"; } + rel2 { relative: 1.0 1.0; to: "title_btns_padding"; } } } part { - name: "title_right_btn"; + name: "elm.swallow.next_btn"; type: SWALLOW; scale: 1; clip_to: "title_clip"; @@ -684,7 +684,7 @@ group { } program { name: "right_btn_show"; - signal: "elm,state,title_right_btn,show"; + signal: "elm,state,elm.swallow.next_btn,show"; source: "elm"; action: STATE_SET "visible" 0.0; script { @@ -694,7 +694,7 @@ group { } program { name: "right_btn_hide"; - signal: "elm,state,title_right_btn,hide"; + signal: "elm,state,elm.swallow.next_btn,hide"; source: "elm"; action: STATE_SET "default" 0.0; script { diff --git a/playview/res/edje/images/button/core_icon_back.png b/playview/res/edje/images/button/core_icon_back.png index baf1df030a3846db95755caa40dbf5b60569cebf..3b3cc24af72409fb19dd0cff60bbea9d37b6dfc9 100755 GIT binary patch literal 385 zcmV-{0e=38P)4qGSd41+=8uh04Y!@C9hqSYskBCfZ^`t1-4F z(#i|?1X$y4p`}lN+>nL1V|JG{{KM^T?m73&oHHYAbBbOa)c_N`$wqvk+(M|L`h)S0 z)(}b##rzB4CE$n}L%+M6V3!WbS4oZLt&)}<{l|DlL7&nm>=oVJpmln&;jvCNQEA#)-DYZK!?uX0b=b8oS%iv;j14TinW zI;(|Z`Ey%v+C!$G+9$G_n-%7JK<^p&5375~US?f-#e{eBmM#WYa8E#5i0lJCgYbNH z4w+J#^b;ZnDBq0bG8>EKqmd9x4uyOh!6h~Wy^cqF4PhcT9q1&Z&HE594|27|K1>;F fd&kLb=y(4B0z7;a>O=tu00000NkvXXu0mjfhX-n*TA>HIW;5GqpB!1xXLdixhgx^GDXSWPQj+a3TQxXYDuC( zMQ%=Bu~mhw64+cTAR8pCucQE0Qj%?}1aVY^Z-9bxeo?A|sh+WJvVozYf|;3~p^2%P znW2t?k%6I+z5x)K=^C0?nVMM{nJYkn6417ylr*a#7dNO~K%T8qMoCG5mA-y?dAVM> zv0i>ry1t>Mr6tG=BO_g)3fZ zE`@j@w*YQzUNJP7fB~jokyxN_sAmB35=^15FMg%Dxp39RB|)hO_hL1;IHa;5RX-@T zIKQ+g85nVC${?!>telHd6HD@oLh|!-V4)b0kzbNuoRMFk;2dnGpb?&#my%yztO-`{ z>ucqiS6q^qmz?V9Vygr+K`%2i#md~=+`!z~&BV#s(#X)z)x^@o!r0Bw&D7k`)y2%r z+z_VMB|o_|H#M&WrZ)wl*A%B-P*TV(0NU)5T9jFqn&MWJpQ`}&vQ;K-w;16x52`l> zw_A*H>eUB2MjsThND&Pa0;V1i6P|2=9C*S{%>$k}MOWC#=&Nwyq=E-NgHY#G)brOdx zo}Js7<6(M=EsTMg$KU`mA;TCG5I03VRg`&-cAm|*DZ<~sTsJ?ZbTxlRUgA!*mG>_7 z*lyo&ZvXoD8gK4p%S_(w{!yiUXS;FpA+M(08(e+Xh}_T#W6F_|mdcTn7P`Zoqfzja zSv$1+)TjC9rIWTixmmHw!pcVD^Nh)1i*5fOm(%613%R24@8HIb22o|UTTY3{N9}cL zx7)C(Z<@swlc-k-n=?)x_Fc48dWLhh$xEm8$qie#O%r{3Y1X8QP;2kf?8>j%QP-oM zth^qvQGD_JDU0jxF5TC0yxtqxOJE<$th8g|VbJ0`tFtrvfF7ts@pScbS?83{1OS(F Bn-c&4 diff --git a/playview/res/edje/images/button/icon_more_menu.png b/playview/res/edje/images/button/icon_more_menu.png new file mode 100755 index 0000000000000000000000000000000000000000..9a5ff34714e0a3d985dd2db21717413fdcce953d GIT binary patch literal 175 zcmeAS@N?(olHy`uVBq!ia0vp^Y(Ol*0U~b-^ehHaEX7WqAsj$Z!;#Vf@@0HVyy) literal 0 HcmV?d00001 diff --git a/playview/res/edje/images/control/T01-2_control_bg_h.png b/playview/res/edje/images/control/T01-2_control_bg_h.png index 6042922b6efe30535437b88971aafa5629427b91..c64b85b9f0ad4db654ae9cac02376644a31d14c1 100755 GIT binary patch literal 3352 zcmeAS@N?(olHy`uVBq!ia0y~yUh?Bp530R%N1DIE+9Jm)=K z978JN-rlgz3ucsPxp?QpiU^b635F9jG&CmOU}E)t@X*`QgURG$$^4Qa%WtyTC3TuX z&nkYuJA8e1`~1f>HGh9!{rKV7c$`Fa?C^U~@&DuH>93XMsW~(N^|NpYC?FUMloA-$#CZ9m34;_iH!v1B2rDAg!gL1+ z8ZdI=vD8s8GB7mIH#E{WFxNFSurf8bGB8wt0wthrMJZ`kK`w4kyMR1frHqo20xNy} z^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#ykcdT2`;I{$wiq3C7Jno3Lp~` zlk!VTY?Xj6g?J&i0B&qvF*KNf0j6J(SfFpHX8`gNOrftYexnUy@&(kzb(T9Bis*s1Tl+ zmy%yz3|8;!Yvq|&T#}fVoa*Ufs{}MbFEca6%GAKv%+1Bj!rao?z|hdu*wMw(!qLUe z42X@49G%=?dR_99OLJ56N?>|Z5PB_f>IEf*+ybD@E~!PCWvMA{Mftf3U@u!`;&zJ} zPV=C8Q*gV*9H(A=pkwqw5sMVjFd<;-0Wsmp7RZ4o{M0;PYA*sNYlaDr6&M)UE_%8+ zhE&{obMvj=Vh09?K*M9pKmL_Zi$BUAW}cbkvpY92dUTwD3P@YK5c ze`h$eGoy^`cfZ$_ygc#kGS%x@=cS@b-=4Rbo_TWPv~~N7kMBHcoOq--@$KGSX}SGT z%+KE?KlxmGwz%l^^PiTt&wt+Y({|(S_urFwEv9FFiFtQy`%%-|RlYsDj(tzMAGPPm zw&rif>n)F+H!aAKk(ZYbpS?P;*!Izm&rJtqc75l2Q~xAl`>fZK>t4(;Ej|~qJ;I;+ zd6t~vvx%>(-_DVjKE1J6ZfBjl-F&{B{V!tNYHLsKm= z9#l-X+aF)wll?cTY~|y)7gDibx8J@LBX;-Kp0%Cl%%ac}*7@FSnSay%-FUF4?zmz8+s|Lk>*8Xn&-m|VtobYd z_rO=NgRy(=&tw7?Z3*+;gF!_cLoAa5h-%?%08s*J3?NyD84MgCZsMrqXdsNHgwgCU eOv{9NRtW~}63wNq`tiJ=^3K!M&t;ucLK6Trw~)sG diff --git a/playview/res/edje/images/control/T01-2_control_circle_icon_next.png b/playview/res/edje/images/control/T01-2_control_circle_icon_next.png index a113871f6c4582bb3f54c0e344c31330fc18dcc7..9ce07bd939432dd913bb199ca8d0bc39175cca97 100755 GIT binary patch literal 395 zcmV;60d)R}P)TE1}86?QG7I6^ZH0um!{mfUw-d zD!;sN%tj3qqPYMN5m?H^TMdQV(8?mYmZ`LWAnJ>Eq7@A8sAv`0Cg=nALL1OBPduj! z9*Q2)5wN6H6r0^8d@x#H6_8e*`s@GTvFNdgimuG0b6&)&&{LG5`c{w4bm%}q;$5bm zS*Jn^3i2&a{e?D^(eq pMgHgbLyp)FWvp$Q)*~8#^9vnq)*oMw1f3 literal 1758 zcmbVNeNfY881HU3MNu}UqJqa_J2yW@law~4rG?R^m5N0UdIGu$p$(9OHnj=1U`01X zbVEJP4d%+B&M{`a+4*t6rb7kA339qQ#Pf>_%ymp>3(BmF?Uo`{|3Lp(E_pwn-|urLC9+=Oh@&930RX zu{=B##|*`5&*L%<=jB{NmqBM}mrM1ek&pRp_%@@NMRPc^c$*p17vMCIgXa+@IoEUi zBo`nIa&Edv3u(W9No0KIm;xq=>jD;pjYLj!vc%|&v zzYKDLF%!B#&V3wIhBgIIk`^2g@uQ>k5DWtd!iR+-1cBcH1Q09$A@)V0V4+lmNCjeG z{Nb|REQVZZDykm$#m?m1e3~{(LC|Wo@~zQ)(vkw8j?tt=N0NmB1*GJYG)d)?Wd!;~B98mRJS)hfk!>PM#DGZelCO!j?u;>%R4D#f50l1fA{L-5XsWYq5E! z2BR;iGw+M9CT=fJToju#Gx+?Mb3DSTtJ{u*M+C=4)aUZb-%P@p1^W#NhrNy2n`dT1 z)IX6Am)~svI@Z1Bdw1={rk2k2QmW-)@xA*uB<{aN;oGMT>+6yL+2#uGYmu!=ThOb_ z{O3%-=d3?P?7zUchkx%akMF% zrRDX}H5=|s+2I~+ciSq@SBoDFn`1^V-KHGFBjJNLG2p}-b-}a4Mq|ZWR>~f zwO`v99ug*N@AIl{aqp#^^Wu&_^7>cV7TQ;P=L}3gCbt`$;Ow&E6IFKPvn5Hb$C*K? zkvs_X9Yw-6{u$Z7u9;^yo~a=Rt*%pjriNKhr?@bnY7SSdD#1|ul^%m zO9#{NUASqn?^-&OVq5APD))Ty;M2SLHo@q8`-avg{=CbLp515P|6$IL{T|Qlz3S1E z3pU(oT4E=iu5{lSv^mi?Qcm6(8L4Em+HzreP*(iU&e8+kVPEo^`l~IMa|aP*p$t%Kr3R$I6<} zJ^y|{!LqQ@Bie)KwyxNBWlLOf*nWWJ;yXZog3OYgTb5=>FT)>dnzSXiO=Y5=a4sP(@UJ}$*wEiYmW~3|2P^| KGI~gn{o#Kda=(87 diff --git a/playview/res/edje/images/control/T01-2_control_circle_icon_pause.png b/playview/res/edje/images/control/T01-2_control_circle_icon_pause.png index 6806d1030c02db734479b9a0e52f739e732aa1a5..d7d02c233462c5d7269745eeb72c31a033fa7fdd 100755 GIT binary patch literal 230 zcmeAS@N?(olHy`uVBq!ia0vp^LO`s*!3HGdYcxIrDVAa<&kznEsNqQI0P^R0x;Tb- zcqgYM1PCNNcsT3)fddi;7})-s8`S)qcH+Q?2h1(~d>dA$r#!fL>%f5nFZvh#u|Mq8 zwmw{V!>nd!TV>|{Z}mD-b_O*&wL0!9ym?h9dE~%{r&`LKY=%8jEh14jl+#UmCJ0~2 zkWh3=Hd%l0P|_9&NnN)MVb+IDyZ`(@@!{z#hL5Ii|M!RFxH!x*<$j)?l*fDUEwboFyt=akR{02diq9RL6T literal 1128 zcmbVLPiWIn7|;H)RfmeZ_~-CQFB5E&mnPW~7Pqu%UB%AQ71o0Xv*c}!Tk>M^YO{eb zJgEb{3JMOrh%mvkhn>BNAj%MiCqYC(&x$WyJ3Z7L49V~P$?yAp-}~P8-7e3bA4!}{ zFbp$NoG~hNEXUu_AjP}KzHiat1j*OP99|?%GeC@P;{^nYuDOIN$h23ly+V@=)3@kU zYou1Xs9M-fn=vOHxjwaKn8~TgH?3tvzyexwJdOSKa+?K?t+De`i7)v%RCi|90yMWa zTea4fEyZT1&Vk8Dr2;M@CWzb>FH|FqZRx6X9&d9jXi>%Ov>UR z1hSllq9n`kED(4oa6EnG6cklSR)ulUepu=)uou;eQE2<3D~+ua;;S6jY&O%)Od1DE z98?q~))0ggWu(GYkC;))3zHoM1BF)L_{6~;h!xER+#niDBi%cK>z7LV!d}=;6ipcy znLY>8JmF6CuDR}dh~ ziwbXu6BLXIA*+i@p<`S0LSlLr>iBi2-?puEpsktgZiZ*#>)AW4fdc0`vI_xrK`Xzi)5U*AlJjs}gaydw;&bacg;xv#>bxLi#-YHr zZSDWb8ApTR;^O$LSUOv@0^{j^>C?r2^B|9QOh8-X$g@q0w$=Tjp;x1wFFP-W8E}}< zlV7)khtnHR-+y@5^KnK^W*&TQ^fNuZ{bTDCN2e(!0L6i$6nlp#Zk>9xyL)5f)}bHr z>*2m`jGq3O7vtugpT91T-uvWk9v}Rt;JSJ>!83194?KCJJ-!h4elb65JkMUa`5XA% BQ;`4w diff --git a/playview/res/edje/images/control/T01-2_control_circle_icon_play.png b/playview/res/edje/images/control/T01-2_control_circle_icon_play.png index 68570acc3a7b0c1b3fab34bc183c70f1ded41f35..5593cb79e1c40337664fec1eeba928a3a4d5e1ef 100755 GIT binary patch literal 476 zcmV<20VDp2P)cIsZN=(icz<{Zvq^fs?-*1Q`UVHc z#1ExpB`9Tcntu}3=bD8AZway1e=aZ@L(bqP%)b2L0=ezb{jKRw)0y5rabbJ9++H>+x zy(Wk5wxeQkh0^u*~_@WjrD&mw;(?< Sa$z+90000afV{1}vLk1Npj*6ZyG zI5}O6nbFOVEHTlDk@+#)hRE&@C2kC(*@BaqFjN98ZU!Qc-G~B_x|<290fz6#s;-|C9EYlRe&g7 zX%=9w#I*>1f#W-Noe?S_C@U-mf?CkGjSMN0g)@9Cx)cRy2&$~oqg<#>(BNjFMU-90 zPs1k>Sma$ugTsgUqO=eZt2TC-+d8BGHT&a_QKoT?#)}?kiM(QqPnU@5% zv5X?{vWwQ{LROLr`s!d>Q3cpxv6({{j>80D!R-!$z{_AOhFeh#+=LmolMaHkmcy$T z0-~vWnDjHA)mUKWLL!O?kzs?8YgXc#3jvv~lpsZYzT3odY*i>A8LD$p6t`fgBpG!rd&e}t@J||RddC7C zQ33S}F(s~szTrDach{cY8(+@< z_QM-j#y*)T8~-(TXuy;SWn|yGB?nGInWrIOL509t2WJ5*gEy>X+0K#sQv;oT(-)cD zsY|ym=B4_H4%5`+JH$j^QP#N=JL7LzCZOcCyu)p&J`y^v>~Otb2wna$(6z85FDug6 zOE$cK7kBw9t83ru>RvpY8F}LT#?j*ME0Whf+IszT)znRBYJT=fdE(iHoO35imk!NA z#|NI0{_M+7`r5Nc=62`4DfPBKes;sI!O5QQF89ZmwojPGGWEIq$$Yl4B0jPqb!0z1 zv!y@T*gCec;TiXA^^3_X11~$49{lv|p=|x_g7d<*@`I!J++)7}Q{P!yznIA?C% zEE=3`I+Bd1?z7?Kh`@x>#uwz{MVxQ n`T_huRk{c01>_4~7=W^%>EPxh+I``5rcR*dwqkZ1e{92G$eQo}l#x+yGYe zTFN-MGftq)FiJ}TWSh)0-(M1Xv*)Ws%=cV4{tpEOHJ* z!$A6Suc$($xEqbSvsEaBNC5;*#-q@tAAhqOgu3o(A#SSZmR;qtMqNK%3u50&_n&Kl z*3AI1?rWwI>fFZ5>noKKT=ao@zZdo9(T1Q-*LYn(!@%>slw@eEoerKwr5`0ApKZa5 z>3e>hk$9XGt!B{?8Hfj4xTjHijJ$(w8G5^~qm+L11R?==XA-p$sv(a#44&6i*@ mIcLwX^(E}eBG;WAy?z05w~T7_OLcYt0000@SP!J#-higrBK&3J&4?B>|8E5RYz1k#aXAVt8j60!?yA=$XQn2-h> zrJW)wOr*7~+O$lK#4vOLBtuY{6ahCDfhq_kM#xmq z@CAcx9Fj@Xju*@l7y=ITe?GT9=sZ6>v=y8f4jhf%Os+&E8r^RoV~ma~cUy0)3pPzV*^RGj z?G;z0l6$fFWSITpuTR{AYsj%5^_4C>uCyLX>e(L0&7ZaLDEIr!o9|HlkqsBV*n8o? zRVF99#e+X^UfR*z6eZ8O{-7w^Q|P(CD7G}c{>c1&7&PN}iDP_-HzuldO!vz=bN>S< zeD=V5KDG)M55ggnGgp<&u0=`Linq?L*t(&SJk{>a^yT?<&Df^cW_^Rs^RUNYG2W~Q zBBp0<|FCFJ`L(jU^UmFK_?*RpNvl|tW0^bxv{3Pzqs;xOIz>xJ*Q*G z-L;2@4NTtmjkjJK-l_2w#B>;vn|CjL+$%vgz57?(nhc|hn8o2eWe=ULZF6h73llxd zy`c%N#L!LEK(Aie=T-YXUX{L@95|Q0@8f!XNJX3aTEXf%cf5O@`^Ni+qbJ=cw?9%A z?OHYS^48kaBMGMHHg#fMw_-MbA9JJTl}D|M~U->|j3@AUp6V&*Xk z(==xB&fZR=YvF@*UbVEoV{`o$_pH;D5>B>r_3u6H9h@uXfZ{ zH>A{ej6N%jYTr-YqpxJQJCpi^3VS58_v>Zun%3HP000>X1^@s6#OZ}&00004b3#c}2nYxW zdCE|=mnZ}H)O%SUQ{ZHR25E8P!B-5>kfK? zgcCG9L1B~7RZ~?gE7B7*y#d6*jtH5r`o=blg9!%Ji^z6n=6yf!z0ZV4Ub&S)xSAjWp-Le0&Tg!|CI%rQFz`1R`87KT1ClRpxJoI* zg!GHgr!#VeifR8BiW>t`YK@s^SDMz-)={BU?-S8WW*jkVLqUVCs79bx%$hU+r&RBN z=p8c)(|%3H$Lne9$SF5Cq;5L1-lT_A;Wy(vM2R5rhc!uNo56C{YsmPAX6qco7{@f z);i>)QtCA`YXBmAyeMkApE!dgfa$Y@>7TrQ_n-vrTD*(`Q3 z@w%O~QUWr_3hlUj0OSkhdY-2mWc>1aj4lMYIl?ZV^ls72NjPt4j_JcGEkgOW!ZNCp g@nkSR4ej;+0H!V@IRA?ve*gdg07*qoM6N<$f+C}5>;M1& literal 1537 zcmb7Edr%a09A5((mGOy=k96D?9KH1RZtuyhoOE})7uT={9;ciRn9JP{ZsTtE*xmCE zGRtR>lZ=iwsi0`XA2p>#Q;C{jUQ=iR+LT#LV`Kx2<|7|yG0|@k&_5h!+S%RTW51uz z=ll9?O}_hu3FBvvM-XI!D~IyH5m%nEPs4X%^CB}GX34ZqE)YuP7%KwA77$7R>I$=E zzysJoWknmvLXe~*oYyD&m|W5?gmG4}!Q-` zVueOV%S0R?$mLXtprFd_^;ebqEdeZhDVh~0Awd|(EE*4oc!`W#u_0a(&XsKqh7Os? zJtfG?*Nnq#$!;pEd)rM0m!E+rP*| zkTJb3%I1y#eDxh>VKO`O>sZOF89O#5?WFLcxpkM(1kK|U+rMPSH8+35oH@m~+%He6 z%h;DzvGaV!8$UefT6S{v;DU|>@9(L8u>Yl&((KZn`=2gZax3e|{LR&UGtX8( zQ<2Um-a7hYH!-yz+r0OWHA!_TcRcv^-;EmzZl*2qR&=gH`&LIZ>(h?iOZAOutjy_n zebSCSonHw@JEsJ1sESfP+wzKi#`WY2MT=AZ&S?Clb<4f%wY{&oL*=dbjDh4^t!I|S z$7a3R_3`eao0hw=5MQ5qZ16-2e)(PRz)$q0 z3As1_xpPVD>5g~xKHHS^zHOZE?abm`HJ|6K+g8}Ht$!Xe=~#8@NtU@$w%6vFQL$iO z!&AF980!@XGiFkBMtZ96A!_-h;hTC#*e_gG4&h9HmL+2Z^ z543%dA8SVsI>R;m3R|LaD>&PvtC}7npYH;NJAKLNOIO`Z(r%yK7piDH-PCcdvu$o~ zP2!`)7i+&CXzr+eZ~6Xc)xaV5eO=n*LA$iBz2I&nJ~k_TN6Ya-;X{AExMJFciQnlynPTpCc2!?d|Eq3AZXZ7F^4|aTH|3}7qTSSC I`P000>X1^@s6#OZ}&00004b3#c}2nYxW zdCE|=mnZ}H)O%SUQ{ZHR25E8P!B-5>kfK? zgcCG9L1B~7RZ~?gE7B7*y#d6*jtH5r`o=blg9!%Ji^z6n=6yf!z0ZV4Ub&S)xSAjWp-Le0&Tg!|CI%rQFz`1R`87KT1ClRpxJoI* zg!GHgr!#VeifR8BiW>t`YK@s^SDMz-)={BU?-S8WW*jkVLqUVCs79bx%$hU+r&RBN z=p8c)(|%3H$Lne9$SF5Cq;5L1-lT_A;Wy(vM2R5rhc!uNo56C{YsmPAX6qco7{@f z);i>)QtCA`YXBmAyeMkApE!dgfa$Y@>7TrQ_n-vrTD*(`Q3 z@w%O~QUWr_3hlUj0OSkhdY-2mWc>1aj4lMYIl?ZV^ls72NjPt4j_JcGEkgOW!ZNCp g@nkSR4ej;+0H!V@IRA?ve*gdg07*qoM6N<$f+C}5>;M1& literal 1690 zcmb7FdrT8|94|glVG4rTgH64jK?*{z*Y?_SqmZ_D6#^A(8$jc5M|;2xdROiaS{R^$ zAsT`x(`_0YGC@aNzzEZAIN8QBl&}f95GTY3Vh!pP8H>Tk+!X=+!!{S+{nvUx=SbBwCyhkC}y0>U|da3h%V<)~JQy9Uf2TEld{gB3M$Svoo0_kl-M) zNi#{rr<;;c8{?1?UK^>~;S|s!QB0iMN!W5p9>^rKDOwBO@8|>p z%B}^|5R=U0G>|z|d@)N}iq~0f#ksaC|HRiDpalprY}%X zW9?a}88c362`ep_!}CrQf?O__)TNLzY&HZ(M@M@(0}9MgWQA@f~7KuowD)9H-j>nUXO4% zX018iOulgbmHeEw$VozGl4A;3n^489RWC`sUdU@W9Rq42*j!SmqLIks$f*w|6PheI zPtimk#@GrRB+VyaTCkvivZD%}5y2E{9MKqbxKJC79yelY4AUDi3{mLt8G@IAf|k@S zU||7=E2330gI*28xKabFjXFf8hxKX=BF8i{*aVv63ED<_MZH++1r~WN7B#RW!85Ft zVe)3WDJ6&D87_x$0tSl;kfc$xopEvD-ck$PLZ}$YQiY`5$TALKD(fiq3VpRkXH*;X zD!t%6u7qK|L66`@ScxlC1|cRGoW|P!cfugS6Uf_TFLm9_me9)H>FgO27PF_2q=llf z!WpYgQ}&8PbG9X5I;;Eg-ThY+t-57fe>m{X{$*stA##0)IiNogy9Na=63>GhK(Oh{ z&LiDQeNbrMjuj;fF{~t|{Lq32;w^zq<*|+Fm5uFXVY`lR;vZ(XhC1eQ*KIBLoVPl% zvpsd|p%pc^F1c@d(u!|wfZ@Y~>LTbBD>IQMtV;fmS``_N!YPuu2u{b8l~T^G8k z%UDQifO7ba!rHT6zr8y)`J!L99OzDwof@vh?X@@%Dg= zL)(t6zZ=0^58K;iu}kOejm0n08`0yMr5Q&?%flsmTi{ zY>2D*aZ_qjiD|{H!bwT8TwH(Zwz}W{Fxqqi9BzKJxqp69B^A2oens5LWgGB5-9)Q6 zuB$YxchJ1tV^EBrcyplP-PL&!xvhy4q)%|^pT@`6TciGQ@5~yE7&*${jvQonYrv++ z@#>8|XUd`dk`qZEn8lwa_^y7m(!HlA34c=WGud`PIPA|5OZb**PlwOs9QW3ezshn; zptCEr!RPDHzEN$)#$va{2Mvsk4j1V0DtA#j-;Wqnp2Gu zM`(|KO7orU_@I5(hUU{t^4_P000>X1^@s6#OZ}&00004b3#c}2nYxW zdCE|=mnZ}H)O%SUQ{ZHR25E8P!B-5>kfK? zgcCG9L1B~7RZ~?gE7B7*y#d6*jtH5r`o=blg9!%Ji^z6n=6yf!z0ZV4Ub&S)xSAjWp-Le0&Tg!|CI%rQFz`1R`87KT1ClRpxJoI* zg!GHgr!#VeifR8BiW>t`YK@s^SDMz-)={BU?-S8WW*jkVLqUVCs79bx%$hU+r&RBN z=p8c)(|%3H$Lne9$SF5Cq;5L1-lT_A;Wy(vM2R5rhc!uNo56C{YsmPAX6qco7{@f z);i>)QtCA`YXBmAyeMkApE!dgfa$Y@>7TrQ_n-vrTD*(`Q3 z@w%O~QUWr_3hlUj0OSkhdY-2mWc>1aj4lMYIl?ZV^ls72NjPt4j_JcGEkgOW!ZNCp g@nkSR4ej;+0H!V@IRA?ve*gdg07*qoM6N<$f+C}5>;M1& literal 1661 zcmb7FdrT8|9IuZt9zsfh35x8fx(Q0J*LP0}X?s^Gp-^k13?Jicf6x=!t9RG6ASxi! zsGExnL19idx1mA7xg~RoF9I{j!^bvsMk3(iTr@+?GFT$AI|TF(W3tQL{T}!Id_LdT zFSpZ@xhynzPOv~A2sNc)R&EsYPhbG|UiIT*6*t7Ncs9F&%42;54Foy|wH`nw7m*LF zfN&IT>;TCE!Hj0omd$3HGf+F_5)-_Q*zfXiXn`O()$bwf1%QRtgM8Ah6%Cy^FM>#i zR*8x}$1 zCTxLL^xUazvjs9xG=LOhS(06XAdpfiM&t^m5?KOCC5RN3aJMoEk)sMFDpf%fmxxoN z9eJn~Gfrr6E3L@MvK|zMeLkPqClgb2K8$EI8lFQcP2wz)m?Aez_>_{aZTR>mQD*b&5iZx1 zHN#rL3+G?S&)AAQ0JZ{#^3ry$ih1*2l6t)mZ#WSHY9{Ccz*W&m6f$7^gV~H`an6%& zq7b9(UKen)CQK{xdPxT=(-{?*Ooc1d1|81TMyioD@qjPRaurRw$uGt4Ozl@-Yc~sX1;gR1DDM2f$&ZDHk-Jb(DOCzDlh#stkIi zUMVr)as<&E^a|XF$Z?s{fXg(9Xaei_-wA^`Phh^wUh2BZEv}XM>C_qG7E`AXxVfUy z+!@)ZFICVJZ3>a<e;nV5oXeME>ASVgCISt;ao!ZwLR-I(u1b4lF#C8r4nC9S}eC^-!I|m_KrU zL@_2WdGCgWSm|p|V}nX8*P7b=!pExIq^u)xpBqlsbtIIP1Z@|d*S6ldIla#lGT7IY z_-<}&SnIO3nx-c$eUIj3ZnB1TJca5u*Va*#ML=b2+)?*M z1lm70w$~#4skirj;ZOw{`t_Y}MjoHta4hp;MCif#gpi%bZ+Y9BGn{=xQu2)jYkkpH zMG<^@VM$8B;O>El*yXGH(>up5-vhJS8gy^3IeZic-Whw({ryWj))U;lXx-{9_{^Hv z((f`Z4|}7|?P@={ztMQ0JMg3G(PbZv-lQM5NMnfIwDFz&*YBb_HkZ*+6@<;(0G b7@HX_AWv02Yw0~W$o~*bcqZ1Q&n^ECTWe|m diff --git a/playview/res/edje/images/function/T01_2_control_icon_screenmode02.png b/playview/res/edje/images/function/T01_2_control_icon_screenmode02.png index d56760cdb6772ce4c442de16bd6edb2ff01a589f..fdc12f62381392579bafa4c24c4487818b04dbbe 100755 GIT binary patch literal 508 zcmVYEkl{K40I0v}T8Vyop#|gul^Q2G#=#UvLO6N?Lgsl1A8ClnH zCih~eGUYlcx&mM?007*M2kn|4Ae}R7%zU~6#ppUCs~Qzn;sUsl^??ANN3%YSoS%p& z3PdPCs4yA5@o-!OI+64e3SeYPMWxh}yE{ftvtDRp&dQFubFW$(0WkBkGqkqaA9es6 zRsbz$*uIFO_MkQ407j{x_SLHd(2UE;u-%9XAYYWM^$Rx?Ko%HAsW4Bd{7)2bWX*~q zJh%Y9zVR)9s5@Tnq+ZAKciJ7mf2}|o|S^Rha$2u-i_Urxinv1Hu$nNrxS`Ik&7x&Fd6rD5l{ yjgA-;!?oq|^5e&(PDHB)GzJ3M`AnlGbLJg;(N5BuVI55X0000FL~Ya5$pG~QX6E1fOm|ynXLev4cZCJQ#(3$l^Y88mbJ>}} zUG{+{)M$vUn)*U$YE4bN#n?b&=G@&X{A1I!lrz*IgxKqFfwuQ0PfGR$bbrM3D2n=n#JY<#Iju$oeN@$z?W6* z_5iU$DjsRTdEJD#o1|+Kv%X2MuTnI4Ig%3uxBuWodw~J_Pb+%1JgR zh^xNPEkLAg+h8dwo6VA0C#jn$3NQ>q(GJSts6`sJR+nZ=xmwMtELsqtl`s{Wxt*df2tdf`^Llt6EsCxXU}!hzD`LZ%WlLHD7X2#7 z?<&@HM=Z;mP_lKiS=T#?9ng^0ZQV-i2F^FRNr1O1nyhE7LU~rA6`-j+17*?FReU+W ztg?ZB8VEig$8cWWDTbT?FkZ&XIXJ*^4v&-L-NY(Z{y#aR5E-h_9P65;C_)`rIIgum zx~vTk)X>D3XfzCR=ro3vbcY45Irr@^-*M5S4_Az5CSK-V`Z|CA%uwcPNqpev3&*pW zYbE}kEqI@?{pvgI*Y54nPYewVG&s)rZy%W|JrTR`_n(KJqrd5VA}gvhOzEfCrgD01 zdA}umW%I?4PMv;XvT^?pBM&Z&e0(ysH)GY?`5Jmi*_=KBe?ODUOWC>n?w=ed>Bgeo2~} zBL)xeu_iOqFFv+=*Mwb_+}GP{CW*)S?uRBbXGbGdMKXNJdSY}1lJ6Wj6KEa0S#xr9 zx*8CJesRnA#m_3i^U-7bu5@SdL%vU+1u|`|B$MGn*MbH(;ukbbNlm(-oIMMhD)1{C!!0~J@xA{ fL%-R0<*st945TmpQ@1r$_``)mQQ^Jd;huj1WUJXw diff --git a/playview/res/edje/images/function/T01_2_control_icon_screenmode02_dim.png b/playview/res/edje/images/function/T01_2_control_icon_screenmode02_dim.png index d98a961b529d3e932caedc2dfd9505cb7cf93ae7..fdc12f62381392579bafa4c24c4487818b04dbbe 100755 GIT binary patch literal 508 zcmVYEkl{K40I0v}T8Vyop#|gul^Q2G#=#UvLO6N?Lgsl1A8ClnH zCih~eGUYlcx&mM?007*M2kn|4Ae}R7%zU~6#ppUCs~Qzn;sUsl^??ANN3%YSoS%p& z3PdPCs4yA5@o-!OI+64e3SeYPMWxh}yE{ftvtDRp&dQFubFW$(0WkBkGqkqaA9es6 zRsbz$*uIFO_MkQ407j{x_SLHd(2UE;u-%9XAYYWM^$Rx?Ko%HAsW4Bd{7)2bWX*~q zJh%Y9zVR)9s5@Tnq+ZAKciJ7mf2}|o|S^Rha$2u-i_Urxinv1Hu$nNrxS`Ik&7x&Fd6rD5l{ yjgA-;!?oq|^5e&(PDHB)GzJ3M`AnlGbLJg;(N5BuVI55X000084`N!!%?B_(H8Gu zAreFh*`kSa;md--EKA%X`e8cbj9bER5>OX(nk>d8PG+`f$Xv2%7S!i}Lq3pwut}fi z|2+Nu{_p>ew>CdlQT{|ZhG7+vJwgoaQvTgmiq<~z=TWph?ubdJ&FpfrvIQ|-HB%6e z=yDpypsWt`&A|o?EAGx%6SZ#(=&*TVGT{WjI8uP2T#GYW(0}lv*!q0 zQ-egp8>OR}FznX$3|g>lusN;__9(1MG&SN4ISwh%p(Eotz1Oh0T##7R%ON>`O%eDi z#OVnVYfdGjt$5h9Anqk;mqPmh?(>kqL$e;X9(U7#rhuEG{VqUrUOz_zeElJiHB0T{ zVuG}83!Q>Qx8r0uipplQWR@XKD@_5GWhvTCx!o>=aM=TfBj;R(y|bV}fVN_38Ame> zJg-qsnf*?XK%TCJpl71d4aJ7No+y+uDkoP2~b1mJWq^kCzFBMK=IE z5J5;3{ceU8LSEWe(6JR)5@^=Tcv(gYga8m3Rtf|}QS$jcVOj(}slbgGwj&z~EZEhM z-F0r@zFaPBLD?~_xM}tlI-s@NbWFS3%;4cRFA4C3W~gS?&X;E`S^-+x%TSdpQ^!~H z%V}HKr-2X%@GS2SGm^*v!1`G~@8$u|yL}8F_7dw{_5b9ILe5b6=GfFMg)7v7d2yrl z(P3kFpn)dFLZk7@XzCdZE9!~}d^~sMw;x-|M|M|UymjJ2N5@nZKlb2(kFra_Pj{Ey zz;>LjdTes4-5D8q0DhRR6r}z8emS-L>evqQ*qcrNj4HL?+%9dOt}Qu_6>q0EmiA{q zc%}XUcY6yxBa*p7?5LVPbmknS-g5>fuKpX&bxn z$rYwQvTeMmw7PS+u#|6-JBO!+2a;b;?z+76!kvM}?c?tar7DB-wczUBh0#;7Yo7Pp zSLTm=f8Z|N_vDMe(~-B5ztVE`)9=>B4z=|je7NLZ`UihIbDUykmKtIGq3J&^^&U^p zmQ64-6N^2wb+aE+$7;T)zI`O|)K4{kemAsm?(f;6&E8yZx>xd;oB`wa|`9E1i LY!;?Nog@DOzlO%m diff --git a/playview/res/edje/images/function/T01_2_control_icon_screenmode02_press.png b/playview/res/edje/images/function/T01_2_control_icon_screenmode02_press.png index fee5177d06178407b62d923bc1c9e1a62f4e077c..fdc12f62381392579bafa4c24c4487818b04dbbe 100755 GIT binary patch literal 508 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 H*vh{FU{>v! diff --git a/playview/res/edje/images/function/T01_2_control_icon_volume.png b/playview/res/edje/images/function/T01_2_control_icon_volume.png index e4424a233a7014b4e413360a73fa8b14088e2d5c..107d42cd3f43b8afe069c17f931aa8684a5e6c81 100755 GIT binary patch literal 742 zcmVX1^@s6BEU{300004b3#c}2nYxW zdzaz_9nfiRjf7vd^##%Tta>b0o#sH(?{uTCf9yC-& zb(y%67FnBPv97UBo(*Kp1^;xLmP1BH(Sr6=*)KLUU zmeuCaj5%^`I0`1{w#1PcdRoxswzS!nG-h^gGB#$D?tu znwX_4#(OMa*%&#AtgC40c74~s))J>}3o#)PHJ<`%Xm$1gT=H2a2)AY3m=gb&1*|2E z)>y}sn1HjRZ~VBC;t~UpH#J+k@M!Nen}tk?f%Khe{&(*lZacXQHBL~PO=rV>-btm# YKfqd43@$i?+5i9m07*qoM6N<$f&rUN*#H0l literal 1646 zcmb7FdrT8|9KY}|6Xzp>%yo#jbL!aa)A`uOP&WiJLD_V;_&}wgyCR@}7?WM@?)SLw=kxi# ze!0!2v}Mzycu@cVOgAK>W^NROo>!)DZ`;v#72NPTi)FCsbPnsoJp`a}(AflNaN)Ux znZO+dYkwpX0U-PkX~|$SjH!s7b_wv1jll16b7%laO!B*Ndp^N}*+ec$siE7)TOp8i zs3DuoC^EWrL>`$O@DS;NG>biuZ&x{>q@`e@AK?gG1dD@ymy==;zZx3jMYwrrTL^(; zCTzYMdg@e$(FE#f4*|*q624so!=PL)fTc3I99{y7MX*>X;%+$~mLf7aB36Lo7sRP~ z965*?)sJg&D>anIvTj5u^!a=OpF}`=a)q!;r3!I~#eB|!&lFHB?&nj?f(ZtcVC){! z&5|?)h8Xc|+RLgT&eNwMxZGwkH;-i|$th+$SzOwLe%vjD1tOtm%qA4y1j=Z9Il|?d zv}RZ{@yz)b@-vnKHz70=4DI#Uxhm!?cuwl&LLtNP7!V`w$tSof>TxGSjD0W~krkZt zB!xRs+U|7`6l*}$kk?B(5Q#=FLnR7KrqpRLt~N?7rbiVhs@0>YOrpUi2%ZOWS^@`$ zmFhI8LXIj#I;{eRF{x6a)N5f4EW+e+l}@9Xz#1rq#VI=x5)EO=XIS}5v53w?;4JO2 z(6n=+n@o8$OEY=28`P!C!MANB<)D2`La5XnHy0{Oc*u2xL+_zo;8@lX@&)<|rADvN zY2{kZ1566TTAfyg>0v1*k?Syt3Wmn9j{lu7A?JxO)Md|g-NY8x%Ax7x8R8a`r;wny zqItM8RyR1e834kp22^A5|9-3LLVmO+roHL#l+`kK_Vj{^g>ro8Y2WhLdS-+`>rrsUJNf0;TubhN6)QPe`j z7glX6xSNx7{HMY1t|*r`r1JRHhK5Y{G^&l?5}72v9og~0Cro!~XYFG^wfo|-1N*Zw zPeioGg zpGL%~a%dm{{vy}b2V*0<*7KeupBywf+alr@NlUj>Jciol zG(2encJ8?x9oz!P*`yjP=cEgN$ z?PP62`lYx>>-)}z-K?O5Z)J9hd*?nX>$`!SUvag@FuSmPWJTZ1&wFO6{?YEQdZooS zy7_*v?!;7AMMuT4(XAbGio%-}v9iWTzL?|MjhTJT^q(6z{ed-Gb|;uFxi(h*dTc1I zzU{(Vsc!g2<c}I#v0Wu!^G3D+;XuEHDr*jw QEeZVr3|Ja^P`kS1KR=RmmjD0& diff --git a/playview/res/edje/images/function/T01_2_control_icon_volume_dim.png b/playview/res/edje/images/function/T01_2_control_icon_volume_dim.png index 8d525b8952dce570ef6dcfe7384bde86e6ad62a0..107d42cd3f43b8afe069c17f931aa8684a5e6c81 100755 GIT binary patch literal 742 zcmVX1^@s6BEU{300004b3#c}2nYxW zdzaz_9nfiRjf7vd^##%Tta>b0o#sH(?{uTCf9yC-& zb(y%67FnBPv97UBo(*Kp1^;xLmP1BH(Sr6=*)KLUU zmeuCaj5%^`I0`1{w#1PcdRoxswzS!nG-h^gGB#$D?tu znwX_4#(OMa*%&#AtgC40c74~s))J>}3o#)PHJ<`%Xm$1gT=H2a2)AY3m=gb&1*|2E z)>y}sn1HjRZ~VBC;t~UpH#J+k@M!Nen}tk?f%Khe{&(*lZacXQHBL~PO=rV>-btm# YKfqd43@$i?+5i9m07*qoM6N<$f&rUN*#H0l literal 1917 zcmb7FX;2eq7!HS6P!RFJD%v&3Axe_Xoh?C<>;{6yMu-ImstL&gF(ex{iwRg2s2u{{ z7QuP|f)1B})nOErLr1NO;|ZgJS3O2XqT<1b$JA~R)E|yB-Pzsm*!Ov!_xfh@6$>Lh zJ*Ik4C=^dw6dXg2G{^Iu8~KiFn!_W9?+GNHh{ci#iyB8MA}yAL0y2X-1&u+~+RXH` zXc&d!(x6ku6Y=r|kOni*)D9b()nFpg6iV1Ut4XcVqXdwIrs#}9>a(M5R6wT{QsX#s zhTJ4UQ*}{UI2xO^P^rn%YXn;Ayl^1Q3Xuc`lu!d!Lz>YHS%uUgUWlAKw&_%0$b`@f zsUMw+mn#4XhNA$7#tPLiKoH<^X&{@!<$`koCIe*B8RX3k1=$dX3o&`X@I@unaBVUa z151as$d!n9NYpBGjB|B-GYWquGCi0Y=RlTxTM5 zm=SO=s*|t`LP#Y&{TPD56r)Q?CCs15jppHGk!hn_)h0SfW6<#-8%KO2D7pOG2!r91 zwV8-PKRf?bezP*ugwkVBGnRpC$SNlLert|bQgxac9r_@bLqCzu z>x}9&7}I1JP$MCOh184;ofcw=q#T&VLpXei2qA037b8-b2g71140Bi_WQ5>LAgM*u zl2{JN5lIlXfFTj{KoDW`r6LhuBt>8;Lx8YF>=CTYXeQJ~4eAheV0E9d{BL3*3681> z3|C@U+DJDkQZWKEr(z~R63YdG<8($XW--rpl$zuwLxoXXw*u8lam)Y=WgXIeMW07H z%9Dt>VlIOW0R+VoF$a-?Y=p&?AS?k$9mZ<^cf#nTCv-=bebIFzTVyLcrk~Cbx%hMn zQ6pJ2oIGP;>sIuVM^`I@MM`V8eThszagq1av&n2ov|+wi!N%PD`HGVd%iR($O?jmX zdr)RI3G#U#a_6=G(IM(AD{G2kOr2O>k{e7rGCjG_Y73Og)`J&RryInaU&B^HEa5HI zSmJo(;@5p~&sK5*-Ldg zw)m)9YH@^Xw4clV9LRlc|6`ZxnVFZWCmiUEn-8269r3$9<|RY1O>-ysfK#yli#2W*^B zI{Zwt+pK)m^hVFEEhldJ<~L209MzwpX?u zi&Aagr0~tYnCX4EV$P%O9jB9u42Krc+bBOIw$(m}T0PMvF{i2LeqT?fDxm*F)c7}h z)3ZzZF5k~xL+{vns9m`Ia1}d6n0~iO)SMW5X6XTDHLNNPx|>*Y7f}UYJl8EvC>v~^ zHaL3b=HmO00`4|O`hw^5O9pv2!|yDP4=?cQ%X1^@s6BEU{300004b3#c}2nYxW zdzaz_9nfiRjf7vd^##%Tta>b0o#sH(?{uTCf9yC-& zb(y%67FnBPv97UBo(*Kp1^;xLmP1BH(Sr6=*)KLUU zmeuCaj5%^`I0`1{w#1PcdRoxswzS!nG-h^gGB#$D?tu znwX_4#(OMa*%&#AtgC40c74~s))J>}3o#)PHJ<`%Xm$1gT=H2a2)AY3m=gb&1*|2E z)>y}sn1HjRZ~VBC;t~UpH#J+k@M!Nen}tk?f%Khe{&(*lZacXQHBL~PO=rV>-btm# YKfqd43@$i?+5i9m07*qoM6N<$f&rUN*#H0l literal 1919 zcmb7FX;2eq7*2}_LXnD95fszlfkzTHAqOj|CfURU4MGS4-b=EOl_VQB8%R(>P>y&* zt<@@rI#|)6hzExkGLEfBD=F3SfVS9xGL?E(ypL`W)E|yB-Pzsm*!Ov!_j`}o)v+P&42b1r_BU5?gFq)7g5%E|mkp<%jMX1425UN}cry)uN)>t#n zAyE{H$9`0mL?kKZfND(7fZa9>i{410DU_%g79*@qM+j;Pl7<=tw7bVn(x|9LKuhE( z!WBj_qD5udI1-;7qf%$5t0OhE8DCMOEFejsM+lf|(d!H*&?2Dq@q*;sz0IUi`%H** z0qu=bNs3si7{d`Nhry<+!vTQG4wnl|qq4#Q7Bif@xpW``FJvz=#5G=O-q>Gk{e9@!6L)Pw7^CtzzApJeKzj%4WJZ?k0bQ@ zx7H>?iM(_EgZw6y)rc^ahzT>}YBGzdq3=n3T*z(Me+Ezidrm zf#E6)(+yNptQI3MlNK{l#qnHfSR!iBU|FWg?o^Z97$P6vy<`zNmxfhxGYE zDNiioin!roNdy3h#3GJF3PecQT(N{53DEknn*SXzCg};&U1jf8-M|)E%I@jg9wHZS zyAUyuNyEt=8_{DuM7D0K91^N5ZT}==S_K?b|lPNGG=qJMHV$aB*1^Qe{@r#S8L(^@7tH#FElT^ zzGu;E)rCPnJE5vGE0+7+nc=+Y80C>@XEz5dEnU@Qva_U9ZD$|qhE;e*xk@rav+}m< zHhOInHeJPB!FiKr7A)}cUOyvtf%fpzd7jRNH&?5nLU9?T#KQgRGpeQ)V!A2{Yg($fsgmBy!l&)6iqFZhmEg}EA>C=mGB&>JKk30Gv?Qa zBLWwz23_(Rxc+b3FzND{Mzj;z{MGNQ!#ThPen@q9eyh59Qc-2- z8YAs%vJ?|G$M_LZ~;SKXx@8m!cuJG%QD_74-7`D5c>ED(?fKesj~NE@JMZCb2+*|qUR#kYLhZ9{oWfQNRrxqZU@@ws--De=nl6}0l!f_ZgG z(Zg$cGWHF<_O$g&+qlf$C)w8v&t9$zYy|JuL|0`t&DlY}`K+@tC4}GNIk(}=y(1H4 z4YPlnR+OK^4PC%H-W75?+U^zN@OOZzCEKnAIvsT$%UZ6M5AT|sH_apFC;@m}m2(_z z_3H~jX8H6T4f^s&rMG4}GM|q6EI9R8;Op+0j+{7!ZC3TfQLRmXI6H@&U+HV#5;EA{ zxNt<}xhsF_#(2j)JyN{nj&z=*@s%`Kvo5m&ODigj-Z0eMmNY%t3R;$H%f>dK@ iq@lmYov16Am(9NJU!q(R1J#I@uKW)*^6ilT diff --git a/playview/res/edje/images/navigation_bg/00_top_bar_empty.png b/playview/res/edje/images/navigation_bg/00_top_bar_empty.png new file mode 100755 index 0000000000000000000000000000000000000000..afd795d9130c6beadb6519cef4deb1f6f3b476bf GIT binary patch literal 2063 zcmeAS@N?(olHy`uVBq!ia0y~yU{h6k4qbHb+Z zg-Aj$MKz4f3*2EGB&`Bs1`KVdMSIaq0;+6ayugp75M~(%w*V0gif z#pV`Po`#1-uF5b25ROP-_`;0re5lMJCbk0wI~NHe6vDI`F#JOGFhofrBXh!zn2T8K zmSFgc=`n`J4GoM2G3zq0*v->Whv~5fhlm3V5_;h#D1i;Jo6W%<<~k(zD(ECI@J!d1 z!s1%y1@cG=VU~?X14=xNMgu%CkLCvC>@r#?!Sl&zp@dQ#55l^Ezf?(sK|>(h4OHKI My85}Sb4q9e094mlQ~&?~ literal 0 HcmV?d00001 diff --git a/playview/res/edje/images/progressbar/T01_2_control_progress_handle.png b/playview/res/edje/images/progressbar/T01_2_control_progress_handle.png index c4e7a4fbc2c11486f092222a477219aa82bcefc8..34baf917a1fd6cc6f603adf960708919bb65929a 100755 GIT binary patch literal 488 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 fe})3GEqpgt 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 Ef|Iy2)&Kwi diff --git a/playview/res/edje/pv-custom-winset.edc b/playview/res/edje/pv-custom-winset.edc index e0022c3..17312f0 100755 --- a/playview/res/edje/pv-custom-winset.edc +++ b/playview/res/edje/pv-custom-winset.edc @@ -21,6 +21,7 @@ externals { external: "feedback"; } collections { + base_scale: CURRENT_BASE_SCALE; plugins { plugin { name: "touch_sound_plugin"; diff --git a/playview/res/edje/pv-normal-control.edc b/playview/res/edje/pv-normal-control.edc index 83d93c2..98cf3ab 100755 --- a/playview/res/edje/pv-normal-control.edc +++ b/playview/res/edje/pv-normal-control.edc @@ -15,6 +15,7 @@ */ #include "pv-image.edc" +#include "custom/pv-custom-define.edc" #define PV_NORMAL_CONTROL_BG "control/T01-2_control_bg.png" #define PV_NORMAL_CONTROL_LANDSCAPE_BG "control/T01-2_control_bg_h.png" @@ -25,7 +26,7 @@ externals { } collections { - + base_scale: CURRENT_BASE_SCALE; #define PV_PART_DESCRIPTION_HIDE \ description { \ state: "hide" 0.0; \ @@ -77,7 +78,7 @@ collections { description { state: "default" 0.0; visible: 0; - min: 0 12; + min: 0 6; fixed: 0 1; align: 0.0 1.0; rel1 { relative: 0.0 1.0; to_y : "pv.normal.control.bg"; } @@ -92,7 +93,7 @@ collections { } part { name: "pv.normal.control.bg.rect"; - type: RECT; + type: IMAGE; scale: 1; description { state: "default" 0.0; @@ -101,7 +102,7 @@ collections { align: 0.5 0.5; rel1 { relative: 0.0 0.0; to: "pv.normal.control.bg";} rel2 { relative: 1.0 1.0; to: "pv.normal.control.bg";} - color: 255 255 255 255; + image{ normal: PV_NORMAL_CONTROL_LANDSCAPE_BG; } } } part { @@ -155,19 +156,20 @@ collections { description { state: "default" 0.0; visible: 1; - min: 0 46;//(26+11+12+34); - max: -1 46;//(26+11+12+34); + min: 1120 50;//(26+11+12+34); + max: 1120 50;//(26+11+12+34); fixed: 0 1; align: 0.0 0.0; - rel1 { relative: 0.0 1.0; to_y: "pv.normal.control.function";} - rel2 { relative: 1.0 1.0; to_y: "pv.normal.control.function";} + rel1 { relative: 0.0 0.0; to_y: "pv.normal.control.bg.rect"; offset: +80 +16;} + rel2 { relative: 1.0 0.0; to_y: "pv.normal.control.bg.rect"; } } description { state: "landscape" 0.0; inherit: "default" 0.0; - min: 0 46; - rel1 { relative: 0.0 0.0; to_y: "pv.normal.control.bg.rect";} + min: 1120 50;//(26+11+12+34); + max: 1120 50;//(26+11+12+34); + rel1 { relative: 0.0 0.0; to_y: "pv.normal.control.bg.rect"; offset: +80 +16;} rel2 { relative: 1.0 0.0; to_y: "pv.normal.control.bg.rect";} } } @@ -180,15 +182,16 @@ collections { description { state: "default" 0.0; visible: 0; - min: 0 70;//(12+70+26+11+12+(34/2)); - max: -1 70;//(12+70+26+11+12+(34/2)); - fixed: 0 1; + min: 80 78;//(12+70+26+11+12+(34/2)); + max: 80 78;//(12+70+26+11+12+(34/2)); + fixed: 1 1; align: 0.0 0.0; rel1 { relative: 0.0 0.0; to_y: "pv.normal.control.bg";} - rel2 { relative: 1.0 0.0; to_y: "pv.normal.control.bg";} + rel2 { relative: 0.0 0.0; to_y: "pv.normal.control.bg";} color: 255 0 0 125; } } + part { name: "pv.normal.control.toolbar.rect"; type: RECT; @@ -197,18 +200,20 @@ collections { description { state: "default" 0.0; visible: 0; - min: 0 80; - max: -1 80; - fixed: 0 1; + min: 80 32; + max: 80 32; + fixed: 1 1; align: 0.0 0.0; - rel1 { relative: 0.0 0.6; to_y: "pv.normal.control.toolbar.top";} - rel2 { relative: 1.0 0.6; to_y: "pv.normal.control.toolbar.top";} + rel1 { relative: 0.0 1.0; to_y: "pv.normal.control.toolbar.top";} + rel2 { relative: 1.0 1.0; to_y: "pv.normal.control.toolbar.top";} color: 255 0 0 255; } description { state: "landscape" 0.0; visible: 0; - fixed: 0 1; + min: 80 32; + max: 80 32; + fixed: 1 1; align: 0.0 0.0; rel1 { relative: 0.0 1.0; to_y: "pv.normal.control.toolbar.top";} rel2 { relative: 1.0 1.0; to_y: "pv.normal.control.toolbar.top";} @@ -285,17 +290,20 @@ collections { description { state: "default" 0.0; visible: 1; - min: 60 60; + min: 32 32; + max: 32 32; fixed: 1 1; - align: 0.5 0.5; - rel1 { relative: 0.05 0.45; to_x: "pv.normal.control.bg"; to_y: "pv.normal.control.toolbar.rect"; offset: +18 0;} - rel2 { relative: 0.05 0.45; to_x: "pv.normal.control.bg"; to_y: "pv.normal.control.toolbar.rect"; offset: +78 0;} + align: 0.0 0.0; + rel1 { relative: 1.0 0.0; to: "pv.normal.control.toolbar.rect"; } + rel2 { relative: 1.0 1.0; to: "pv.normal.control.toolbar.rect"; } color: 255 255 255 255; } PV_PART_DESCRIPTION_HIDE PV_PART_DESCRIPTION_SHOW } + + part { name: "pv.normal.control.toolbar.popupPlayer"; type: SWALLOW; @@ -315,6 +323,24 @@ collections { PV_PART_DESCRIPTION_SHOW } + part { + name: "pv.normal.control.toolbar.play.control.padding"; + type: RECT; + mouse_events: 1; + scale: 1; + description { + state: "default" 0.0; + visible: 0; + min: 44 44; + max: 44 44; + fixed: 1 1; + align: 0.0 0.0; + rel1 { relative: 0.0 0.0; to: "pv.normal.control.bg";} + rel2 { relative: 0.0 0.0; to: "pv.normal.control.bg";} + color: 0 0 255 255; + } + } + part { name: "pv.normal.control.play"; type: SWALLOW; @@ -323,11 +349,12 @@ collections { description { state: "default" 0.0; visible: 1; - min: 80 80; + min: 48 48; + max: 48 48; fixed: 1 1; align: 0.5 0.5; - rel1 { relative: 0.5 0.0; to_y: "pv.normal.control.toolbar.rect";} - rel2 { relative: 0.5 1.0; to_y: "pv.normal.control.toolbar.rect";} + rel1 { relative: 0.5 1.0; to_x: pv.normal.control.bg; to_y: "pv.normal.control.toolbar.play.control.padding"; offset: 0 24;} + rel2 { relative: 0.5 1.0; to_x: pv.normal.control.bg; to_y: "pv.normal.control.toolbar.play.control.padding"; offset: 0 24;} color: 255 255 255 255; } PV_PART_DESCRIPTION_HIDE @@ -358,11 +385,12 @@ collections { description { state: "default" 0.0; visible: 0; - min: 16 0; - fixed: 1 0; - align: 1.0 0.5; - rel1 { relative: 0.0 0.0; to_x: "pv.normal.control.play"; to_y: "pv.normal.control.toolbar.rect";} - rel2 { relative: 0.0 1.0; to_x: "pv.normal.control.play"; to_y: "pv.normal.control.toolbar.rect";} + min: 40 48; + max: 40 48; + fixed: 1 1; + align: 1.0 0.0; + rel1 { relative: 0.0 0.0; to : "pv.normal.control.play"; } + rel2 { relative: 0.0 1.0; to : "pv.normal.control.play"; } color: 255 255 0 255; } } @@ -375,12 +403,13 @@ collections { description { state: "default" 0.0; visible: 0; - min: 16 0; - fixed: 1 0; - align: 0.0 0.5; - rel1 { relative: 1.0 0.0; to_x: "pv.normal.control.play"; to_y: "pv.normal.control.toolbar.rect";} - rel2 { relative: 1.0 1.0; to_x: "pv.normal.control.play"; to_y: "pv.normal.control.toolbar.rect";} - color: 255 255 0 255; + min: 40 48; + max: 40 48; + fixed: 1 1; + align: 0.0 0.0; + rel1 { relative: 1.0 0.0; to : "pv.normal.control.play"; } + rel2 { relative: 1.0 1.0; to : "pv.normal.control.play"; } + color: 255 0 0 255; } } @@ -392,11 +421,12 @@ collections { description { state: "default" 0.0; visible: 1; - min: 110 110; + min: 48 48; + max: 48 48; fixed: 1 1; - align: 1.0 0.5; - rel1 { relative: 0.0 0.5; to_x: "pv.normal.control.play.left.padding"; to_y: "pv.normal.control.toolbar.rect";} - rel2 { relative: 0.0 0.5; to_x: "pv.normal.control.play.left.padding"; to_y: "pv.normal.control.toolbar.rect";} + align: 1.0 0.0; + rel1 { relative: 0.0 0.0; to_x: "pv.normal.control.play.left.padding"; to_y: "pv.normal.control.play";} + rel2 { relative: 0.0 1.0; to_x: "pv.normal.control.play.left.padding"; to_y: "pv.normal.control.play";} color: 255 255 255 255; } PV_PART_DESCRIPTION_HIDE @@ -411,11 +441,12 @@ collections { description { state: "default" 0.0; visible: 1; - min: 110 110; + min: 48 48; + max: 48 48; fixed: 1 1; - align: 0.0 0.5; - rel1 { relative: 1.0 0.5; to_x: "pv.normal.control.play.right.padding"; to_y: "pv.normal.control.toolbar.rect";} - rel2 { relative: 1.0 0.5; to_x: "pv.normal.control.play.right.padding"; to_y: "pv.normal.control.toolbar.rect";} + align: 0.0 0.0; + rel1 { relative: 1.0 0.0; to_x: "pv.normal.control.play.right.padding"; to_y: "pv.normal.control.play";} + rel2 { relative: 1.0 1.0; to_x: "pv.normal.control.play.right.padding"; to_y: "pv.normal.control.play";} color: 255 255 255 255; } PV_PART_DESCRIPTION_HIDE diff --git a/playview/res/edje/pv-normal-main.edc b/playview/res/edje/pv-normal-main.edc index 1c219c0..79267cc 100755 --- a/playview/res/edje/pv-normal-main.edc +++ b/playview/res/edje/pv-normal-main.edc @@ -15,6 +15,7 @@ */ #include "pv-image.edc" +#include "custom/pv-custom-define.edc" #define FONT_BOLD_TYPE "Tizen:style=Bold" #define FONT_COLOR 255 255 255 255 @@ -39,6 +40,7 @@ externals { } collections { + base_scale: CURRENT_BASE_SCALE; plugins { plugin { name: "touch_sound_plugin"; @@ -489,12 +491,12 @@ collections { description { state: "portrait.show" 0.0; inherit: "default" 0.0; - min: 0 110; + min: 0 120; } description { state: "landscape.show" 0.0; inherit: "default" 0.0; - min: 0 100; + min: 0 120; } } @@ -541,6 +543,25 @@ collections { } } + + part { + name: "pv.normal.main.control.volume.icon.rightpadding"; + type: RECT; + mouse_events: 0; + scale: 1; + description { + state: "default" 0.0; + visible: 0; + min: 80 78;//(12+70+26+11+12+(34/2)); + max: 80 78;//(12+70+26+11+12+(34/2)); + fixed: 1 1; + align: 1.0 0.0; + rel1 { relative: 0.0 0.0; to_y: "pv.normal.main.control";} + rel2 { relative: 1.0 0.0; to_y: "pv.normal.main.control";} + color: 255 255 0 125; + } + } + part { name: "pv.normal.main.volume.icon"; type: SWALLOW; @@ -548,12 +569,12 @@ collections { scale: 1; description { state: "default" 0.0; - min: 60 60; + min: 32 32; fixed: 1 1; - align: 0.0 1.0; + align: 1.0 0.0; visible: 0; - rel1 { relative: 1.0 -0.02; to_y : "pv.normal.main.control"; offset: -134 0;} - rel2 { relative: 1.0 -0.02; to_y : "pv.normal.main.control"; offset: -194 0;} + rel1 { relative: 0.0 1.0; to: "pv.normal.main.control.volume.icon.rightpadding"; } + rel2 { relative: 0.0 1.0; to: "pv.normal.main.control.volume.icon.rightpadding"; } } description { state: "portrait.show" 0.0; @@ -567,6 +588,7 @@ collections { } } + part { name: "pv.normal.main.speed.rect"; type: RECT; diff --git a/playview/res/edje/pv-progressbar.edc b/playview/res/edje/pv-progressbar.edc index e98fd54..89bc2fe 100755 --- a/playview/res/edje/pv-progressbar.edc +++ b/playview/res/edje/pv-progressbar.edc @@ -14,6 +14,7 @@ * limitations under the License. */ #include "pv-image.edc" +#include "custom/pv-custom-define.edc" #define FONT_BOLD_TYPE "Tizen:style=Bold" #define FONT_MEDIUM_TYPE "Tizen:style=Medium" @@ -27,16 +28,32 @@ */ #define PLAYER_PROGRESSBAR_H 4 -#define PLAYER_CIRCLE_W 26 -#define PLAYER_CIRCLE_H 26 -#define PLAYER_CIRCLE_PRESS_W 26 -#define PLAYER_CIRCLE_PRESS_H 26 +#define PLAYER_CIRCLE_W 24 +#define PLAYER_CIRCLE_H 24 +#define PLAYER_CIRCLE_PRESS_W 42 +#define PLAYER_CIRCLE_PRESS_H 42 #define IMG_PLAYER_PROGRESSBAR_BG "progressbar/core_progress_bar.#.png" #define IMG_PLAYER_PROGRESSBAR_HANDLE "progressbar/T01_2_control_progress_handle.png" #define IMG_PLAYER_PROGRESSBAR_HANDLE_PRESS "progressbar/T01_2_control_progress_handle_press.png" + +styles { + style { name: "progess_playing_text"; + base: "font=Tizen:weight=Regular:width=BreezeSans font_size=18 color=#001447"; + } +} + +styles { + style { name: "progess_duration_text"; + base: "font=Tizen:weight=Regular:width=BreezeSans font_size=18 align=right color=#001447"; + } +} + + + collections { + base_scale: CURRENT_BASE_SCALE; group { name: "pv.progress"; @@ -64,7 +81,7 @@ collections { description { state: "default" 0.0; visible: 0; - min: 12 0; + min: 80 0; fixed: 1 0; align: 0.0 0.0; rel1 { relative: 0.0 0.0; to_y : "pv.progress.bg";} @@ -75,7 +92,7 @@ collections { description { state: "landscape" 0.0; inherit: "default" 0.0; - min: 12 0; + min: 80 0; } } @@ -104,7 +121,7 @@ collections { description { state: "default" 0.0; visible: 0; - min: 12 0; + min: 80 0; fixed: 1 0; align: 1.0 0.0; rel1 { relative: 1.0 0.0; to_y : "pv.progress.bg";} @@ -115,7 +132,7 @@ collections { description { state: "landscape" 0.0; inherit: "default" 0.0; - min: 12 0; + min: 80 0; } } @@ -154,61 +171,58 @@ collections { part { name: "pv.progress.playing.txt"; - type: TEXT; + type: TEXTBLOCK; mouse_events: 1; scale: 1; - effect: FAR_SHADOW BOTTOM; description { state: "default" 0.0; visible: 1; - min: 90 16; + min: 120 22; fixed: 1 1; align: 0.0 1.0; - rel1 { relative: 1.0 1.0; offset: 0 -40; to_x : "pv.progress.playing.txt.left.padding"; to_y : "pv.progress.bottom.padding";} - rel2 { relative: 1.0 1.0; offset: 0 -40; to_x : "pv.progress.playing.txt.left.padding"; to_y : "pv.progress.bottom.padding";} - color: 5 131 198 255; + rel1 { relative: 0.0 1.0; to_x : "pv.progress.bg"; to_y : "pv.progress.bg";} + rel2 { relative: 0.0 1.0; to_x : "pv.progress.bg"; to_y : "pv.progress.bg";} + color: 0 8 28 255; text { - size: 12; text: "00:00:00"; align: 0.0 0.5; + style: progess_playing_text; } } description { state: "landscape" 0.0; inherit: "default" 0.0; - align: 0.0 0.5; - rel1 { relative: 1.0 0.5; offset: 0 40; to_x : "pv.progress.playing.txt.left.padding"; to_y : "pv.progress.bg";} - rel2 { relative: 1.0 0.5; offset: 0 40; to_x : "pv.progress.playing.txt.left.padding"; to_y : "pv.progress.bg";} + align: 0.0 1.0; + rel1 { relative: 0.0 1.0; to_x : "pv.progress.bg"; to_y : "pv.progress.bg";} + rel2 { relative: 0.0 1.0; to_x : "pv.progress.bg"; to_y : "pv.progress.bg";} } } part { name: "pv.progress.duration.txt"; - type: TEXT; + type: TEXTBLOCK; mouse_events: 1; scale: 1; - effect: FAR_SHADOW BOTTOM; description { state: "default" 0.0; visible: 1; - min: 90 16; + min: 120 22; fixed: 1 1; align: 1.0 1.0; - rel1 { relative: 0.0 1.0; offset: 0 -40; to_x : "pv.progress.duration.txt.right.padding"; to_y : "pv.progress.bottom.padding";} - rel2 { relative: 0.0 1.0; offset: 0 -40; to_x : "pv.progress.duration.txt.right.padding"; to_y : "pv.progress.bottom.padding";} - color: 179 179 179 255; + rel1 { relative: 1.0 1.0; to_x : "pv.progress.bg"; to_y : "pv.progress.bg";} + rel2 { relative: 1.0 1.0; to_x : "pv.progress.bg"; to_y : "pv.progress.bg";} + color: 0 8 28 255; text { - size: 12; text: "--:--:--"; - align: 1.0 0.5; + style: progess_duration_text; } } description { state: "landscape" 0.0; inherit: "default" 0.0; - align: 1.0 0.5; - rel1 { relative: 0.0 0.5; offset: 0 40; to_x : "pv.progress.duration.txt.right.padding"; to_y : "pv.progress.bg";} - rel2 { relative: 0.0 0.5; offset: 0 40; to_x : "pv.progress.duration.txt.right.padding"; to_y : "pv.progress.bg";} + align: 1.0 1.0; + rel1 { relative: 1.0 1.0; to_x : "pv.progress.bg"; to_y : "pv.progress.bg";} + rel2 { relative: 1.0 1.0; to_x : "pv.progress.bg"; to_y : "pv.progress.bg";} } } @@ -223,18 +237,18 @@ collections { min: 0 PLAYER_PROGRESSBAR_H; fixed: 0 1; align: 0.0 0.0; - rel1 { relative: 0.02 0.0; to_x : "pv.progress.playing.txt"; to_y : "pv.progress.bg";} - rel2 { relative: 0.98 0.0; to_x : "pv.progress.duration.txt"; to_y : "pv.progress.bg";} + rel1 { relative: 0.0 0.0; offset: 0 +10; to_x : "pv.progress.playing.txt"; to_y : "pv.progress.bg";} + rel2 { relative: 1.0 0.0; offset: 0 +10; to_x : "pv.progress.duration.txt"; to_y : "pv.progress.bg";} image { normal: IMG_PLAYER_PROGRESSBAR_BG;} - color: 179 179 179 255; + color: 255 255 255 255; } description { state: "landscape" 0.0; inherit: "default" 0.0; - align: 1.0 0.5; - rel1 { relative: 0.02 0.5; to_x : "pv.progress.playing.txt"; to_y : "pv.progress.bg";} - rel2 { relative: 0.98 0.5; to_x : "pv.progress.duration.txt"; to_y : "pv.progress.bg";} + align: 0.0 0.0; + rel1 { relative: 0.0 0.0; offset: 0 +10; to_x : "pv.progress.playing.txt"; to_y : "pv.progress.bg";} + rel2 { relative: 1.0 0.0; offset: 0 +10; to_x : "pv.progress.duration.txt"; to_y : "pv.progress.bg";} } } part { @@ -250,7 +264,7 @@ collections { rel1 { relative: 0.0 0.0; to: "pv.progress.bar.bg"; offset : -2 -1; } rel2 { relative: 0.5 1.0; to_x: "pv.progress.circle"; to_y: "pv.progress.bar.bg"; } image { normal: IMG_PLAYER_PROGRESSBAR_BG;} - color: 0 166 191 255; + color: 10 14 74 255; } description { @@ -391,7 +405,7 @@ collections { rel1 { relative: 0.5 0.5; to_x: "pv.progress.circle"; to_y: "pv.progress.bar.bg"; } rel2 { relative: 0.5 0.5; to_x: "pv.progress.circle"; to_y: "pv.progress.bar.bg"; } image { normal: IMG_PLAYER_PROGRESSBAR_HANDLE;} - color: 0 166 191 255; + color: 10 14 74 255; } } part { @@ -408,7 +422,7 @@ collections { rel1 { relative: 0.5 0.5; to_x: "pv.progress.circle"; to_y: "pv.progress.bar.bg"; } rel2 { relative: 0.5 0.5; to_x: "pv.progress.circle"; to_y: "pv.progress.bar.bg"; } image { normal: IMG_PLAYER_PROGRESSBAR_HANDLE_PRESS;} - color: 0 166 191 255; + color: 10 14 74 255; } description { state: "show" 0.0; diff --git a/playview/src/view/vp-play-normal-view.c b/playview/src/view/vp-play-normal-view.c index 03d2625..6eb5fa3 100755 --- a/playview/src/view/vp-play-normal-view.c +++ b/playview/src/view/vp-play-normal-view.c @@ -673,40 +673,40 @@ static void _vp_play_normal_view_set_volume_state(NormalView * pNormalView) if ((nVolume == 0) || bMute) { pIcon = - vp_button_create_icon(pNormalView->pVolumeBtn, edj_path, + vp_button_create_icon(pNormalView->pVolumeBtn, NULL, VP_PLAY_NORMAL_RES_MUTE); elm_object_part_content_set(pNormalView->pVolumeBtn, VP_PLAY_SWALLOW_BUTTON_ICON, pIcon); pIcon = - vp_button_create_icon(pNormalView->pVolumeBtn, edj_path, + vp_button_create_icon(pNormalView->pVolumeBtn, NULL, VP_PLAY_NORMAL_RES_MUTE_PRESS); elm_object_part_content_set(pNormalView->pVolumeBtn, VP_PLAY_SWALLOW_BUTTON_PRESS_ICON, pIcon); pIcon = - vp_button_create_icon(pNormalView->pVolumeBtn, edj_path, + vp_button_create_icon(pNormalView->pVolumeBtn, NULL, VP_PLAY_NORMAL_RES_MUTE_DIM); elm_object_part_content_set(pNormalView->pVolumeBtn, VP_PLAY_SWALLOW_BUTTON_DIM_ICON, pIcon); } else { pIcon = - vp_button_create_icon(pNormalView->pVolumeBtn, edj_path, + vp_button_create_icon(pNormalView->pVolumeBtn, NULL, VP_PLAY_NORMAL_RES_VOLUME); elm_object_part_content_set(pNormalView->pVolumeBtn, VP_PLAY_SWALLOW_BUTTON_ICON, pIcon); pIcon = - vp_button_create_icon(pNormalView->pVolumeBtn, edj_path, + vp_button_create_icon(pNormalView->pVolumeBtn, NULL, VP_PLAY_NORMAL_RES_VOLUME_PRESS); elm_object_part_content_set(pNormalView->pVolumeBtn, VP_PLAY_SWALLOW_BUTTON_PRESS_ICON, pIcon); pIcon = - vp_button_create_icon(pNormalView->pVolumeBtn, edj_path, + vp_button_create_icon(pNormalView->pVolumeBtn, NULL, VP_PLAY_NORMAL_RES_VOLUME_DIM); elm_object_part_content_set(pNormalView->pVolumeBtn, VP_PLAY_SWALLOW_BUTTON_DIM_ICON, @@ -5692,6 +5692,10 @@ static void __vp_normal_more_btn_clicked_cb(void *pUserData, pNormalView->pCtxPopup = elm_ctxpopup_add(pPlayView->pWin); + + elm_ctxpopup_direction_priority_set(pNormalView->pCtxPopup, ELM_CTXPOPUP_DIRECTION_UP, ELM_CTXPOPUP_DIRECTION_UNKNOWN, ELM_CTXPOPUP_DIRECTION_UNKNOWN, ELM_CTXPOPUP_DIRECTION_UNKNOWN); + + if (!pNormalView->pCtxPopup) { VideoLogError("pNormalView->pCtxPopup is NULL"); return; @@ -5845,7 +5849,7 @@ static void __vp_normal_more_btn_clicked_cb(void *pUserData, case VIDEO_PLAY_TYPE_PREVIEW: break; } - +/* int nW = 0; int nH = 0; @@ -5865,9 +5869,9 @@ static void __vp_normal_more_btn_clicked_cb(void *pUserData, nW = rect.h / 2; nH = rect.w; } - - evas_object_move(pNormalView->pCtxPopup, nW, nH); - +*/ + evas_object_resize(pNormalView->pCtxPopup, 320, 300); + evas_object_move(pNormalView->pCtxPopup, 1280, 64); evas_object_show(pNormalView->pCtxPopup); } @@ -6192,7 +6196,7 @@ static void __vp_normal_function_btn_clicked_cb(void *pUserData, pIcon = vp_button_create_icon(pNormalView->pScreenSizeBtn, - edj_path, + NULL, VP_PLAY_NORMAL_RES_SCREEN_1_MODE); elm_object_part_content_set(pNormalView->pScreenSizeBtn, VP_PLAY_SWALLOW_BUTTON_ICON, @@ -6200,13 +6204,11 @@ static void __vp_normal_function_btn_clicked_cb(void *pUserData, pIcon = vp_button_create_icon(pNormalView->pScreenSizeBtn, - edj_path, + NULL, VP_PLAY_NORMAL_RES_SCREEN_1_MODE); elm_object_part_content_set(pNormalView->pScreenSizeBtn, VP_PLAY_SWALLOW_BUTTON_PRESS_ICON, pIcon); - elm_object_text_set(pNormalView->pScreenSizeBtn, - VP_PLAY_STRING_COM_FULL); return; } else if (pNormalView->nDisplayMode == @@ -6244,7 +6246,7 @@ static void __vp_normal_function_btn_clicked_cb(void *pUserData, pIcon = vp_button_create_icon(pNormalView->pScreenSizeBtn, - edj_path, + NULL, VP_PLAY_NORMAL_RES_SCREEN_2_MODE); elm_object_part_content_set(pNormalView->pScreenSizeBtn, VP_PLAY_SWALLOW_BUTTON_ICON, @@ -6252,13 +6254,11 @@ static void __vp_normal_function_btn_clicked_cb(void *pUserData, pIcon = vp_button_create_icon(pNormalView->pScreenSizeBtn, - edj_path, + NULL, VP_PLAY_NORMAL_RES_SCREEN_2_MODE_PRESS); elm_object_part_content_set(pNormalView->pScreenSizeBtn, VP_PLAY_SWALLOW_BUTTON_PRESS_ICON, pIcon); - elm_object_text_set(pNormalView->pScreenSizeBtn, - VP_PLAY_STRING_COM_KEEP_RATIO); return; } @@ -11713,7 +11713,7 @@ static void _vp_play_normal_view_set_volume_lock_state(NormalView * if (!bLockState) { pNormalView->pVolumeBtn = vp_button_create(pParent, "custom/flat_46_46/default", - VP_PLAY_STRING_COM_VOLUME, + NULL, (Evas_Smart_Cb) __vp_normal_function_btn_clicked_cb, (Evas_Smart_Cb) @@ -12391,7 +12391,7 @@ static bool _vp_play_normal_view_create_main_control(NormalView * pNormalView->pResumeBtn = vp_button_create(pParent, "custom/circle_1/default", - VP_PLAY_STRING_COM_PLAY, + NULL, (Evas_Smart_Cb) __vp_normal_control_btn_clicked_cb, (Evas_Smart_Cb) __vp_normal_control_btn_press_cb, @@ -12405,7 +12405,7 @@ static bool _vp_play_normal_view_create_main_control(NormalView * pNormalView->pPauseBtn = vp_button_create(pParent, "custom/circle_1_focus/default", - VP_PLAY_STRING_COM_PAUSE, + NULL, (Evas_Smart_Cb) __vp_normal_control_btn_clicked_cb, (Evas_Smart_Cb) __vp_normal_control_btn_press_cb, @@ -12460,14 +12460,13 @@ static bool _vp_play_normal_view_create_main_control(NormalView * pNormalView->pScreenSizeBtn = vp_button_create(pParent, "custom/flat_56_56/default", - VP_PLAY_STRING_COM_FULL, + NULL, (Evas_Smart_Cb) __vp_normal_function_btn_clicked_cb, (Evas_Smart_Cb) __vp_normal_control_btn_press_cb, (Evas_Smart_Cb) __vp_normal_control_btn_unpress_cb, (void *) pNormalView); - evas_object_color_set(pNormalView->pScreenSizeBtn, 0, 166, 191, 255); if (!pNormalView->pScreenSizeBtn) { VideoLogError("elm_button_add is fail"); return FALSE; @@ -12491,26 +12490,26 @@ static bool _vp_play_normal_view_create_main_control(NormalView * Evas_Object *pIcon = NULL; pIcon = - vp_button_create_icon(pNormalView->pResumeBtn, edj_path, + vp_button_create_icon(pNormalView->pResumeBtn, NULL, VP_PLAY_NORMAL_RES_RESUME); elm_object_part_content_set(pNormalView->pResumeBtn, VP_PLAY_SWALLOW_BUTTON_ICON, pIcon); pIcon = - vp_button_create_icon(pNormalView->pPauseBtn, edj_path, + vp_button_create_icon(pNormalView->pPauseBtn, NULL, VP_PLAY_NORMAL_RES_PAUSE); elm_object_part_content_set(pNormalView->pPauseBtn, VP_PLAY_SWALLOW_BUTTON_ICON, pIcon); if (pNormalView->nDisplayMode == VP_MM_PLAYER_DISPLAY_FULL_SCREEN) { pIcon = - vp_button_create_icon(pNormalView->pScreenSizeBtn, edj_path, + vp_button_create_icon(pNormalView->pScreenSizeBtn, NULL, VP_PLAY_NORMAL_RES_SCREEN_2_MODE); elm_object_part_content_set(pNormalView->pScreenSizeBtn, VP_PLAY_SWALLOW_BUTTON_ICON, pIcon); pIcon = - vp_button_create_icon(pNormalView->pScreenSizeBtn, edj_path, + vp_button_create_icon(pNormalView->pScreenSizeBtn, NULL, VP_PLAY_NORMAL_RES_SCREEN_2_MODE); elm_object_part_content_set(pNormalView->pScreenSizeBtn, VP_PLAY_SWALLOW_BUTTON_PRESS_ICON, @@ -12519,13 +12518,13 @@ static bool _vp_play_normal_view_create_main_control(NormalView * } else if (pNormalView->nDisplayMode == VP_MM_PLAYER_DISPLAY_ORIGIN_SIZE) { pIcon = - vp_button_create_icon(pNormalView->pScreenSizeBtn, edj_path, + vp_button_create_icon(pNormalView->pScreenSizeBtn, NULL, VP_PLAY_NORMAL_RES_SCREEN_1_MODE); elm_object_part_content_set(pNormalView->pScreenSizeBtn, VP_PLAY_SWALLOW_BUTTON_ICON, pIcon); pIcon = - vp_button_create_icon(pNormalView->pScreenSizeBtn, edj_path, + vp_button_create_icon(pNormalView->pScreenSizeBtn, NULL, VP_PLAY_NORMAL_RES_SCREEN_1_MODE); elm_object_part_content_set(pNormalView->pScreenSizeBtn, VP_PLAY_SWALLOW_BUTTON_PRESS_ICON, @@ -12533,14 +12532,14 @@ static bool _vp_play_normal_view_create_main_control(NormalView * } else if (pNormalView->nDisplayMode == VP_MM_PLAYER_DISPLAY_ORIGIN_OR_LETTER) { pIcon = - vp_button_create_icon(pNormalView->pScreenSizeBtn, edj_path, + vp_button_create_icon(pNormalView->pScreenSizeBtn, NULL, VP_PLAY_NORMAL_RES_SCREEN_3_MODE); elm_object_part_content_set(pNormalView->pScreenSizeBtn, VP_PLAY_SWALLOW_BUTTON_ICON, pIcon); } else { pIcon = - vp_button_create_icon(pNormalView->pScreenSizeBtn, edj_path, + vp_button_create_icon(pNormalView->pScreenSizeBtn, NULL, VP_PLAY_NORMAL_RES_SCREEN_1_MODE); elm_object_part_content_set(pNormalView->pScreenSizeBtn, VP_PLAY_SWALLOW_BUTTON_ICON, pIcon); @@ -13047,11 +13046,23 @@ static bool _vp_play_normal_view_init_layout(NormalView * pNormalView) (void *) pNormalView); elm_access_highlight_set(pNormalView->pMainLayout); + Evas_Object *pRightbtn = elm_button_add(pNormalView->pNaviFrame); + elm_object_style_set(pRightbtn, "more_menu"); + evas_object_smart_callback_add(pRightbtn, "clicked", + __vp_normal_more_btn_clicked_cb, + (void *) pNormalView); + + evas_object_show(pRightbtn); pNormalView->pNaviItem = - elm_naviframe_item_push(pNormalView->pNaviFrame, NULL, NULL, NULL, + elm_naviframe_item_push(pNormalView->pNaviFrame, NULL, NULL, pRightbtn, pNormalView->pMainLayout, "playview/1line"); + if (!pNormalView->pNaviItem) { + VideoLogError("elm_naviframe_item_push fail"); + return FALSE; + } + Evas_Object *pLeftbtn = elm_button_add(pNormalView->pNaviFrame); elm_object_style_set(pLeftbtn, "back"); evas_object_smart_callback_add(pLeftbtn, "clicked", @@ -13065,11 +13076,6 @@ static bool _vp_play_normal_view_init_layout(NormalView * pNormalView) __vp_normal_naviframe_pop_cb, (void *) pNormalView); - if (!pNormalView->pNaviItem) { - VideoLogError("elm_naviframe_item_push fail"); - return FALSE; - } - elm_object_signal_callback_add(pNormalView->pMainLayout, VP_NORMAL_SIGNAL_MAIN_SHOW_FINISH, "*", __vp_normal_show_finish_cb, @@ -15409,13 +15415,6 @@ bool vp_play_normal_view_handle_language_change(normal_view_handle * pViewHandle VP_EVAS_DEL(pNormalView->pCtxPopup); - if (pNormalView->nDisplayMode == VP_MM_PLAYER_DISPLAY_LETTER_BOX) { - elm_object_text_set(pNormalView->pScreenSizeBtn, - VP_PLAY_STRING_COM_FULL); - } else { - elm_object_text_set(pNormalView->pScreenSizeBtn, - VP_PLAY_STRING_COM_KEEP_RATIO); - } return TRUE; } diff --git a/playview/src/widget/vp-play-button.c b/playview/src/widget/vp-play-button.c index 305d525..2635c92 100755 --- a/playview/src/widget/vp-play-button.c +++ b/playview/src/widget/vp-play-button.c @@ -19,6 +19,9 @@ /* check temp */ #include "vp-play-log.h" +#include + + /** * * @param pParent @@ -86,10 +89,22 @@ Evas_Object *vp_button_create_icon(Evas_Object * pParent, Evas_Object *pObj = NULL; pObj = elm_icon_add(pParent); - if (!elm_image_file_set(pObj, pEdjPath, pGroupName)) { - VideoLogError("elm_image_file_set is fail"); - return NULL; + if (pEdjPath == NULL) { + char image_path[2048] = {0, }; + char *path = app_get_resource_path(); + if (!path){ + VideoLogError("Resource path is NULL"); + return NULL; + } + + snprintf(image_path, 2048, "%s%s%s", path, "/edje/images/", pGroupName); + free(path); + elm_image_file_set(pObj, image_path, NULL); + } + else { + elm_image_file_set(pObj, pEdjPath, pGroupName); } + evas_object_size_hint_weight_set(pObj, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(pObj, EVAS_HINT_FILL, EVAS_HINT_FILL); diff --git a/vp-main/res/edje/custom/pv-custom-button.edc b/vp-main/res/edje/custom/pv-custom-button.edc index 381da26..c604c04 100755 --- a/vp-main/res/edje/custom/pv-custom-button.edc +++ b/vp-main/res/edje/custom/pv-custom-button.edc @@ -18,9 +18,9 @@ #define BUTTON_NAVIFRAME_TITLE_BUTTON_BG_MIN_MAX_INC 63 63 #define BUTTON_NAVIFRAME_TITLE_BUTTON_MIN_MAX_INC 63 63 -#define BUTTON_CUSTOM_ICON_NORMAL_COLOR 236 234 226 255 -#define BUTTON_CUSTOM_ICON_PRESS_COLOR 64 147 247 255 -#define BUTTON_CUSTOM_ICON_DIM_COLOR 236 234 226 75 +#define BUTTON_CUSTOM_ICON_NORMAL_COLOR 10 14 74 255 +#define BUTTON_CUSTOM_ICON_PRESS_COLOR 43 95 185 255 +#define BUTTON_CUSTOM_ICON_DIM_COLOR 195 202 210 255 #define BUTTON_NAVIFRAME_MORE_BG_MIN_MAX_INC 85 98 #define BUTTON_NAVIFRAME_MORE_DEFAULT_IMAGE_MIN_MAX_INC 63 63 @@ -156,7 +156,6 @@ group { \ } - group { name: "elm/button/base/custom/circle_1/default"; parts { @@ -165,10 +164,10 @@ group { type: RECT; description { state: "default" 0.0; - rel1.relative: 0.3 0.3; - rel2.relative: 0.7 0.7; - color: 0 166 191 255; + rel1.relative: 0.0 0.0; + rel2.relative: 1.0 1.0; visible: 0; + color: 255 0 0 100; } description { state: "clicked" 0.0; @@ -183,74 +182,6 @@ group { inherit: "default" 0.0; } } - part { - name: "button_bg"; - type: IMAGE; - mouse_events: 0; - description { - state: "default" 0.0; - visible: 1; - rel1.relative: 0 0; - rel2.relative: 1 1; - rel1.to: "button_image"; - rel2.to: "button_image"; - image.normal: "button/T01-2_control_circle_button_01_press.png"; - color: 0 166 191 255; - } - description { - state: "clicked" 0.0; - inherit: "default" 0.0; - image.normal: "button/T01-2_control_circle_button_01_press.png"; - color: 0 166 191 255; - } - description { - state: "disabled" 0.0; - inherit: "default" 0.0; - image.normal: "button/T01-2_control_circle_button_01_press.png"; - color: 0 166 191 255; - } - description { - state: "focused" 0.0; - inherit: "default" 0.0; - image.normal: "button/T01-2_control_circle_button_01_press.png"; - color: 0 166 191 255; - } - } - - part { - name: "button_circle"; - type: IMAGE; - scale: 1; - mouse_events: 0; - description { - state: "default" 0.0; - visible: 1; - rel1.relative: 0 0; - rel2.relative: 1 1; - rel1.to: "button_image"; - rel2.to: "button_image"; - image.normal: "button/T01-2_control_circle_button_01.png"; - color: 0 166 191 255; - } - description { - state: "clicked" 0.0; - inherit: "default" 0.0; - image.normal: "button/T01-2_control_circle_button_01.png"; - color: 0 166 191 255; - } - description { - state: "disabled" 0.0; - inherit: "default" 0.0; - image.normal: "button/T01-2_control_circle_button_01.png"; - color: 0 166 191 255; - } - description { - state: "focused" 0.0; - inherit: "default" 0.0; - image.normal: "button/T01-2_control_circle_button_01_focus.png"; - color: 0 166 191 255; - } - } part { name: "elm.text"; type: TEXT; @@ -277,12 +208,15 @@ group { description { state: "default" 0.0; visible: 1; - rel1.relative: 0 0; + max: 32 32; + min: 32 32; + rel1.relative: 0 0; rel2.relative: 1 1; - rel1.to: "button_image"; + rel1.to: "button_image"; rel2.to: "button_image"; } } + part { name: "over2"; type: RECT; @@ -352,6 +286,7 @@ group { action: SIGNAL_EMIT "elm,action,unpress" ""; after: "button_unclick_anim"; } + program { name: "button_unclick_anim"; action: STATE_SET "default" 0.0; @@ -388,23 +323,7 @@ group { //target: "button_bg"; } - /*program { - name: "focused"; - signal: "elm,action,focus"; - source: "elm"; - action: STATE_SET "focused" 0.0; - target: "button_circle"; - target: "button_bg"; - } - program { - name: "unfocused"; - signal: "elm,action,unfocus"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "button_circle"; - target: "button_bg"; - }*/ program { name: "button_clicked"; source: "over2"; @@ -420,12 +339,9 @@ group { part { name: "button_image"; type: RECT; - type: RECT; description { state: "default" 0.0; - rel1.relative: 0.3 0.3; - rel2.relative: 0.7 0.7; - color: 0 255 0 255; + color: 0 0 255 100; visible: 0; } description { @@ -441,75 +357,7 @@ group { inherit: "default" 0.0; } } - part { - name: "button_bg"; - type: IMAGE; - scale: 1; - mouse_events: 0; - description { - state: "default" 0.0; - visible: 1; - rel1.relative: 0 0; - rel2.relative: 1 1; - rel1.to: "button_image"; - rel2.to: "button_image"; - image.normal: "button/T01-2_control_circle_button_01_press.png"; - color: 0 166 191 255; - } - description { - state: "clicked" 0.0; - inherit: "default" 0.0; - image.normal: "button/T01-2_control_circle_button_01_press.png"; - color: 0 166 191 255; - } - description { - state: "disabled" 0.0; - inherit: "default" 0.0; - image.normal: "button/T01-2_control_circle_button_01_press.png"; - color: 0 166 191 255; - } - description { - state: "focused" 0.0; - inherit: "default" 0.0; - image.normal: "button/T01-2_control_circle_button_01_press.png"; - color: 0 166 191 255; - } - } - - part { - name: "button_circle"; - type: IMAGE; - scale: 1; - mouse_events: 0; - description { - state: "default" 0.0; - visible: 1; - rel1.relative: 0 0; - rel2.relative: 1 1; - rel1.to: "button_image"; - rel2.to: "button_image"; - image.normal: "button/T01-2_control_circle_button_01.png"; - color: 0 166 191 255; - } - description { - state: "clicked" 0.0; - inherit: "default" 0.0; - image.normal: "button/T01-2_control_circle_button_01.png"; - color: 0 166 191 255; - } - description { - state: "disabled" 0.0; - inherit: "default" 0.0; - image.normal: "button/T01-2_control_circle_button_01.png"; - color: 0 166 191 255; - } - description { - state: "focused" 0.0; - inherit: "default" 0.0; - image.normal: "button/T01-2_control_circle_button_01.png"; - color: 0 166 191 255; - } - } + part { name: "elm.text"; type: TEXT; @@ -531,17 +379,20 @@ group { part { name: "elm.swallow.content"; type: SWALLOW; - scale: 1; + scale: 1; mouse_events: 0; description { state: "default" 0.0; visible: 1; - rel1.relative: 0 0; + max: 32 32; + min: 32 32; + rel1.relative: 0 0; rel2.relative: 1 1; - rel1.to: "button_image"; + rel1.to: "button_image"; rel2.to: "button_image"; } } + part { name: "over2"; type: RECT; @@ -583,10 +434,7 @@ group { state: "disabled" 0.0; inherit: "default" 0.0; visible: 1; - rel1.relative: 0 0; - rel2.relative: 1 1; - rel1.to: "button_image"; - rel2.to: "button_image"; + } } } /* parts */ @@ -603,8 +451,6 @@ group { name: "button_click_anim"; action: STATE_SET "clicked" 0.0; target: "button_image"; - target: "button_circle"; - target: "button_bg"; } program { @@ -618,8 +464,6 @@ group { name: "button_unclick_anim"; action: STATE_SET "default" 0.0; target: "button_image"; - target: "button_circle"; - target: "button_bg"; } program { @@ -636,8 +480,6 @@ group { action: STATE_SET "disabled" 0.0; target: "button_image"; target: "disabler"; - target: "button_circle"; - target: "button_bg"; } program { name: "enable"; @@ -646,27 +488,9 @@ group { action: STATE_SET "default" 0.0; target: "button_image"; target: "disabler"; - target: "button_circle"; - target: "button_bg"; } - program { - name: "focused"; - signal: "elm,action,focus"; - source: "elm"; - action: STATE_SET "focused" 0.0; - target: "button_circle"; - target: "button_bg"; - } - program { - name: "unfocused"; - signal: "elm,action,unfocus"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "button_circle"; - target: "button_bg"; - } program { name: "button_clicked"; source: "over2"; @@ -676,6 +500,9 @@ group { } /* programs */ } + + + group { name: "elm/button/base/custom/circle_2/default"; parts { @@ -684,11 +511,12 @@ group { type: IMAGE; description { state: "default" 0.0; - rel1.relative: 0.8 0.3; - rel2.relative: 1.2 0.7; + rel1.relative: 0.0 0.0; + rel2.relative: 1.0 1.0; + max: 21 24; + min: 21 24; visible: 1; image { normal: "control/T01-2_control_circle_icon_rewind.png";} - color: 0 166 191 255; } description { state: "clicked" 0.0; @@ -703,74 +531,22 @@ group { inherit: "default" 0.0; } } - - /*part { - name: "button_bg"; + + part { + name: "button_imageAMIT"; type: IMAGE; - mouse_events: 0; description { state: "default" 0.0; + rel1.relative: 0.0 0.0; + rel2.relative: 1.0 1.0; + max: 21 24; + min: 21 24; visible: 1; - rel1.relative: 0 0; - rel2.relative: 1 1; - rel1.to: "button_image"; - rel2.to: "button_image"; - image.normal: "button/T01-2_control_circle_button_02_press.png"; - color: 0 0 0 153; + color: 255 0 0 100; + visible: 1; } - description { - state: "clicked" 0.0; - inherit: "default" 0.0; - image.normal: "button/T01-2_control_circle_button_02_press.png"; - color: 66 162 207 255; - } - description { - state: "disabled" 0.0; - inherit: "default" 0.0; - image.normal: "button/T01-2_control_circle_button_02_press.png"; - color: 0 0 0 153; - } - description { - state: "focused" 0.0; - inherit: "default" 0.0; - image.normal: "button/T01-2_control_circle_button_02_press.png"; - color: 0 0 0 153; - } - } - - part { - name: "button_circle"; - type: IMAGE; - mouse_events: 0; - description { - state: "default" 0.0; - visible: 1; - rel1.relative: 0 0; - rel2.relative: 1 1; - rel1.to: "button_image"; - rel2.to: "button_image"; - image.normal: "button/T01-2_control_circle_button_02.png"; - color: 255 255 255 255 128; - } - description { - state: "clicked" 0.0; - inherit: "default" 0.0; - image.normal: "button/T01-2_control_circle_button_02.png"; - color: 66 162 207 255; - } - description { - state: "disabled" 0.0; - inherit: "default" 0.0; - image.normal: "button/T01-2_control_circle_button_02.png"; - color: 255 255 255 51; - } - description { - state: "focused" 0.0; - inherit: "default" 0.0; - image.normal: "button/T01-2_control_circle_button_02.png"; - color: 255 255 255 255 128; - } - }*/ + } + part { name: "elm.text"; type: TEXT; @@ -788,20 +564,6 @@ group { } } } - /*part { - name: "elm.swallow.content"; - type: SWALLOW; - mouse_events: 0; - description { - state: "default" 0.0; - visible: 1; - rel1.relative: 0 0; - rel2.relative: 1 1; - - rel1.to: "button_image"; - rel2.to: "button_image"; - } - }*/ part { name: "over2"; type: RECT; @@ -893,8 +655,7 @@ group { action: STATE_SET "disabled" 0.0; target: "button_image"; target: "disabler"; - //target: "button_circle"; - //target: "button_bg"; + } program { name: "enable"; @@ -903,22 +664,8 @@ group { action: STATE_SET "default" 0.0; target: "button_image"; target: "disabler"; - //target: "button_circle"; - //target: "button_bg"; - } - /*program { - name: "focused"; - action: STATE_SET "focused" 0.0; - target: "button_circle"; - target: "button_bg"; } - program { - name: "unfocused"; - action: STATE_SET "default" 0.0; - target: "button_circle"; - target: "button_bg"; - }*/ program { name: "button_clicked"; source: "over2"; @@ -937,11 +684,13 @@ group { type: IMAGE; description { state: "default" 0.0; - rel1.relative: -0.2 0.3; - rel2.relative: 0.2 0.7; + rel1.relative: 0.0 0.0; + rel2.relative: 1.0 1.0; + align: 0.5 0.5; + max: 21 24; + min: 21 24; visible: 1; image { normal: "control/T01-2_control_circle_icon_next.png";} - color: 0 166 191 255; } description { state: "clicked" 0.0; @@ -957,73 +706,6 @@ group { } } - /*part { - name: "button_bg"; - type: IMAGE; - mouse_events: 0; - description { - state: "default" 0.0; - visible: 1; - rel1.relative: 0 0; - rel2.relative: 1 1; - rel1.to: "button_image"; - rel2.to: "button_image"; - image.normal: "button/T01-2_control_circle_button_02_press.png"; - color: 0 0 0 153; - } - description { - state: "clicked" 0.0; - inherit: "default" 0.0; - image.normal: "button/T01-2_control_circle_button_02_press.png"; - color: 66 162 207 255; - } - description { - state: "disabled" 0.0; - inherit: "default" 0.0; - image.normal: "button/T01-2_control_circle_button_02_press.png"; - color: 0 0 0 153; - } - description { - state: "focused" 0.0; - inherit: "default" 0.0; - image.normal: "button/T01-2_control_circle_button_02_press.png"; - color: 0 0 0 153; - } - } - - part { - name: "button_circle"; - type: IMAGE; - mouse_events: 0; - description { - state: "default" 0.0; - visible: 1; - rel1.relative: 0 0; - rel2.relative: 1 1; - rel1.to: "button_image"; - rel2.to: "button_image"; - image.normal: "button/T01-2_control_circle_button_02.png"; - color: 255 255 255 255 128; - } - description { - state: "clicked" 0.0; - inherit: "default" 0.0; - image.normal: "button/T01-2_control_circle_button_02.png"; - color: 66 162 207 255; - } - description { - state: "disabled" 0.0; - inherit: "default" 0.0; - image.normal: "button/T01-2_control_circle_button_02.png"; - color: 255 255 255 51; - } - description { - state: "focused" 0.0; - inherit: "default" 0.0; - image.normal: "button/T01-2_control_circle_button_02.png"; - color: 255 255 255 255 128; - } - }*/ part { name: "elm.text"; type: TEXT; @@ -1041,20 +723,7 @@ group { } } } - /*part { - name: "elm.swallow.content"; - type: SWALLOW; - mouse_events: 0; - description { - state: "default" 0.0; - visible: 1; - rel1.relative: 0 0; - rel2.relative: 1 1; - - rel1.to: "button_image"; - rel2.to: "button_image"; - } - }*/ + part { name: "over2"; type: RECT; @@ -1113,8 +782,6 @@ group { name: "button_click_anim"; action: STATE_SET "clicked" 0.0; target: "button_image"; - //target: "button_circle"; - //target: "button_bg"; } program { @@ -1128,8 +795,7 @@ group { name: "button_unclick_anim"; action: STATE_SET "default" 0.0; target: "button_image"; - //target: "button_circle"; - //target: "button_bg"; + } program { @@ -1146,8 +812,7 @@ group { action: STATE_SET "disabled" 0.0; target: "button_image"; target: "disabler"; - //target: "button_circle"; - //target: "button_bg"; + } program { name: "enable"; @@ -1156,22 +821,9 @@ group { action: STATE_SET "default" 0.0; target: "button_image"; target: "disabler"; - //target: "button_circle"; - //target: "button_bg"; - } - /*program { - name: "focused"; - action: STATE_SET "focused" 0.0; - target: "button_circle"; - target: "button_bg"; + } - program { - name: "unfocused"; - action: STATE_SET "default" 0.0; - target: "button_circle"; - target: "button_bg"; - }*/ program { name: "button_clicked"; source: "over2"; @@ -2823,11 +2475,8 @@ group { name: "button_image"; type: RECT; scale: 1; - - description { + description { state: "default" 0.0; - rel1.relative:0.0 0.0; - rel2.relative:0.95 1.0; color:255 0 0 255; visible: 0; } @@ -2852,11 +2501,11 @@ group { description { state: "default" 0.0; visible: 1; - min: 26 26; - max: 26 26; - //fixed: 1 1; + min: 28 25; + max: 28 25; + align: 0.5 0.5; rel1 - { relative: 0.0 0.0; to:"button_image";} + {relative: 0.0 0.0; to:"button_image"; } rel2 {relative: 1.0 1.0; to:"button_image"; } } @@ -2874,11 +2523,13 @@ group { description { state: "default" 0.0; visible: 0; - min: 26 26; - max: 26 26; - fixed: 1 1; - rel1.to: "button_image"; - rel2.to: "button_image"; + min: 28 25; + max: 28 25; + align: 0.5 0.5; + rel1 + { relative: 0.0 0.0; to:"button_image"; } + rel2 + {relative: 1.0 1.0; to:"button_image"; } } description { state: "show" 0.0; @@ -2894,11 +2545,13 @@ group { description { state: "default" 0.0; visible: 0; - min: 26 26; - max: 26 26; - fixed: 1 1; - rel1.to: "button_image"; - rel2.to: "button_image"; + min: 28 25; + max: 28 25; + align: 0.5 0.5; + rel1 + { relative: 0.0 0.0; to:"button_image"; } + rel2 + {relative: 1.0 1.0; to:"button_image"; } } description { state: "show" 0.0; @@ -3047,8 +2700,6 @@ group { type: RECT; description { state: "default" 0.0; - //rel1.relative:0.7 0.0; - //rel2.relative:1.0 1.0; color:0 0 255 255; visible: 0; } @@ -3073,13 +2724,13 @@ group { description { state: "default" 0.0; visible: 1; - min: 26 26; - max: 26 26; - //fixed: 1 1; + min: 32 26; + max: 32 26; + fixed: 1 1; rel1 - { relative: 0.0 0.0; to:"button_image";} + {relative: 0.0 0.0; to:"button_image";} rel2 - {relative: 1.0 1.0; to:"button_image"; } + {relative: 1.0 1.0; to:"button_image";} } description { state: "hide" 0.0; @@ -3095,11 +2746,13 @@ group { description { state: "default" 0.0; visible: 0; - min: 26 26; - max: 26 26; + min: 32 26; + max: 32 26; fixed: 1 1; - rel1.to: "button_image"; - rel2.to: "button_image"; + rel1 + {relative: 0.0 0.0; to:"button_image";} + rel2 + {relative: 1.0 1.0; to:"button_image";} } description { state: "show" 0.0; @@ -3115,11 +2768,13 @@ group { description { state: "default" 0.0; visible: 0; - min: 26 26; - max: 26 26; + min: 32 26; + max: 32 26; fixed: 1 1; - rel1.to: "button_image"; - rel2.to: "button_image"; + rel1 + {relative: 0.0 0.0; to:"button_image";} + rel2 + {relative: 1.0 1.0; to:"button_image";} } description { state: "show" 0.0; @@ -3127,6 +2782,7 @@ group { visible: 1; } } + part { name: "elm.text"; type: TEXT; @@ -4410,28 +4066,35 @@ group { part { name: "bg"; type: RECT; + scale: 1; mouse_events: 1; description { state: "default" 0.0; - color: 0 0 0 0; - min: 80 80; - max: 80 80; + min: 48 48; + max: 48 48; + visible: 0; + color: 0 0 0 0; } } part { name: "icon"; type: IMAGE; mouse_events: 1; + scale: 1; description { state: "default" 0.0; rel1 { - relative: 0 0; + relative: 0.5 0.5; to: "bg"; } rel2 { - relative: 1 1; + relative: 0.5 0.5; to: "bg"; } + align: 0.5 0.5; + min: 11 18; + max: 11 18; + fixed: 1 1; image { normal: "button/core_icon_back.png"; } @@ -4464,6 +4127,75 @@ group { action: RUN_PLUGIN "touch_sound_plugin"; } } - } +group { + name: "elm/button/base/more_menu"; + images + { + image: "button/icon_more_menu.png" COMP; + } + parts { + part { + name: "bg"; + type: RECT; + mouse_events: 1; + description { + state: "default" 0.0; + color: 0 0 0 0; + min: 48 48; + max: 48 48; + } + } + part { + name: "icon"; + type: IMAGE; + mouse_events: 1; + scale: 1; + description { + state: "default" 0.0; + min: 6 24; + max: 6 24; + align: 0.5 0.5; + fixed: 1 0; + rel1 { + relative: 0.0 0.0; + to: "bg"; + } + rel2 { + relative: 1.0 1.0; + to: "bg"; + } + image { + normal: "button/icon_more_menu.png"; + } + } + } + } /*parts*/ + programs { + program { + name: "buttonclicked"; + signal: "mouse,clicked,1"; + source: "bg"; + action: SIGNAL_EMIT "elm,action,click" ""; + } + program { + name: "buttontextclicked"; + signal: "mouse,clicked,1"; + source: "icon"; + action: SIGNAL_EMIT "elm,action,click" ""; + } + program{ + name: "touch_snd"; + source: "bg"; + signal: "mouse,clicked,1"; + action: RUN_PLUGIN "touch_sound_plugin"; + } + program{ + name: "touch_snd1"; + source: "icon"; + signal: "mouse,clicked,1"; + action: RUN_PLUGIN "touch_sound_plugin"; + } + } +} diff --git a/vp-main/res/edje/custom/pv-custom-define.edc b/vp-main/res/edje/custom/pv-custom-define.edc index 6d43fee..e475a3d 100755 --- a/vp-main/res/edje/custom/pv-custom-define.edc +++ b/vp-main/res/edje/custom/pv-custom-define.edc @@ -19,5 +19,5 @@ #define VIDEO_TITLE_FONT_STYLE "Tizen:style=Medium" #define VIDEO_TITLE_FONT_SIZE 40 #define VIDEO_TITLE_FONT_DEFAULT_COLOR 255 255 255 204 - +#define CURRENT_BASE_SCALE 1.8 diff --git a/vp-main/res/edje/custom/pv-custom-image.edc b/vp-main/res/edje/custom/pv-custom-image.edc index 48b3805..e5afca4 100755 --- a/vp-main/res/edje/custom/pv-custom-image.edc +++ b/vp-main/res/edje/custom/pv-custom-image.edc @@ -16,6 +16,7 @@ images { + image: "navigation_bg/00_top_bar_empty.png" COMP; /* multi window */ image: "multi/T01_2_mw_control_bg_left.png" COMP; image: "multi/T01_2_mw_control_bg_left_press.png" COMP; @@ -43,6 +44,7 @@ images image: "button/T01-2_control_circle_button_03.png" COMP; image: "button/T01-2_control_circle_button_03_press.png" COMP; image: "button/core_icon_back.png" COMP; + image: "button/icon_more_menu.png" COMP; image: "control/T01-2_control_circle_icon_rewind.png" COMP; image: "control/T01-2_control_circle_icon_next.png" COMP; /*genlist*/ diff --git a/vp-main/res/edje/custom/pv-custom-naviframe.edc b/vp-main/res/edje/custom/pv-custom-naviframe.edc index 98f6e08..334253f 100755 --- a/vp-main/res/edje/custom/pv-custom-naviframe.edc +++ b/vp-main/res/edje/custom/pv-custom-naviframe.edc @@ -17,17 +17,17 @@ #define NAVIFRAME_TITLE_BG_COLOR_INC 0 0 0 0 #define NAVIFRAME_TOOLBAR_BG_COLOR_INC 0 0 0 0 -#define NAVIFRAME_TITLE_TOP_PADDING_INC 0 16 -#define NAVIFRAME_TITLE_H_INC 50 +#define NAVIFRAME_TITLE_TOP_PADDING_INC 0 16 +#define NAVIFRAME_TITLE_H_INC 80 #define NAVIFRAME_TOOLBAR_HEIGHT_INC 0 -#define NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC 63 63 +#define NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC 48 48 #define NAVIFRAME_PADDING_INC 20 0 -#define NAVIFRAME_PADDING2_INC 6 0 +#define NAVIFRAME_PADDING2_INC 20 0 #define NAVIFRAME_PADDING3_INC 8 0 -#define NAVIFRAME_BOTTOM_TEXT_PADDING_INC 0 11 -#define NAVIFRAME_BOTTOM_RIGHT_PADDING_INC 26 11 +#define NAVIFRAME_BOTTOM_TEXT_PADDING_INC 0 16 +#define NAVIFRAME_BOTTOM_RIGHT_PADDING_INC 20 16 #define NAVIFRAME_BOTTOM_PADDING_INC 0 10 #define NAVIFRAME_VIEW_TRANS_TIME 0.3 @@ -41,9 +41,19 @@ #define NAVIFRAME_TAG_HEIGHT 192 +styles { + style { name: "title_default_text"; + base: "font=Tizen:weight=Regular:width=BreezeSans align=center color=#000C2B font_size=26"; + } +} + group { name:"elm/naviframe/item/playview/basic/default"; alias:"elm/naviframe/item/playview/1line/default"; + images + { + image: "navigation_bg/00_top_bar_empty.png" COMP; + } script { public tbar_bg = 0; //Toolbar BG Show call count public buttons_visible = 0; //when both buttons are visible @@ -98,7 +108,7 @@ group { part { name: "title_bg"; - type: RECT; + type: IMAGE; scale: 1; description { state: "default" 0.0; @@ -108,7 +118,7 @@ group { visible: 1; rel1 { relative: 0.0 0.0; to: "title_swallow"; } rel2 { relative: 1.0 0.0; to: "title_swallow"; } - color: NAVIFRAME_TITLE_BG_COLOR_INC; + image { normal: "navigation_bg/00_top_bar_empty.png"; } } /* description { @@ -190,7 +200,7 @@ group { scale: 1; description { state: "default" 0.0; - min: 45 0; + min: 76 0; fixed: 1 0; align: 0.0 0.5; rel1 { relative: 0.0 0.0; to: "title_bg"; } @@ -211,14 +221,6 @@ group { // _NATIVE_BUFFER_SYNC rel1 { relative: 0.0 0.0; to: "base"; } rel2 { relative: 1.0 1.0; to: "base"; } - /* - rel1.relative: 0.0 1.0; - rel1.to_x: "base"; - rel1.to_y: "title_bg"; - rel2.relative: 1.0 0.0; - rel2.to_x: "base"; - rel2.to_y: "toolbar_bg"; - */ } description { state: "sip_visible" 0.0; @@ -244,7 +246,7 @@ group { scale: 1; description { state: "default" 0.0; - min: 45 0; + min: 88 0; fixed: 1 0; align: 1.0 0.5; rel1 { relative: 1.0 0.0; to: "title_bg"; } @@ -269,8 +271,7 @@ group { } part { name: "elm.text.title"; - type: TEXT; - effect: FAR_SHADOW BOTTOM; + type: TEXTBLOCK; scale: 1; repeat_events: 1; clip_to: "title_clip"; @@ -279,14 +280,13 @@ group { text { min: 0 0; max: 1 0; - size: 18; + style: title_default_text; } /* chageable GUI color: VIDEO_TITLE_FONT_DEFAULT_COLOR; color3: 0 0 0 255; align: 0.5 0.5; */ - color: 240 240 240 255; fixed: 1 1; rel1 { relative: 1.0 1.0; to_x: "padding_center_text1"; to_y: "top_padding"; } @@ -381,12 +381,12 @@ group { max: NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC; fixed: 1 1; align: 0.0 0.5; - rel1 { relative: 0.5 0.0; to: "title_btns_padding"; } - rel2 { relative: 0.5 1.0; to: "title_btns_padding"; } + rel1 { relative: 1.0 0.0; to: "title_btns_padding"; } + rel2 { relative: 1.0 1.0; to: "title_btns_padding"; } } } part { - name: "title_right_btn"; + name: "elm.swallow.next_btn"; type: SWALLOW; scale: 1; clip_to: "title_clip"; @@ -684,7 +684,7 @@ group { } program { name: "right_btn_show"; - signal: "elm,state,title_right_btn,show"; + signal: "elm,state,elm.swallow.next_btn,show"; source: "elm"; action: STATE_SET "visible" 0.0; script { @@ -694,7 +694,7 @@ group { } program { name: "right_btn_hide"; - signal: "elm,state,title_right_btn,hide"; + signal: "elm,state,elm.swallow.next_btn,hide"; source: "elm"; action: STATE_SET "default" 0.0; script { diff --git a/vp-main/res/edje/images/button/core_icon_back.png b/vp-main/res/edje/images/button/core_icon_back.png index baf1df030a3846db95755caa40dbf5b60569cebf..3b3cc24af72409fb19dd0cff60bbea9d37b6dfc9 100755 GIT binary patch literal 385 zcmV-{0e=38P)4qGSd41+=8uh04Y!@C9hqSYskBCfZ^`t1-4F z(#i|?1X$y4p`}lN+>nL1V|JG{{KM^T?m73&oHHYAbBbOa)c_N`$wqvk+(M|L`h)S0 z)(}b##rzB4CE$n}L%+M6V3!WbS4oZLt&)}<{l|DlL7&nm>=oVJpmln&;jvCNQEA#)-DYZK!?uX0b=b8oS%iv;j14TinW zI;(|Z`Ey%v+C!$G+9$G_n-%7JK<^p&5375~US?f-#e{eBmM#WYa8E#5i0lJCgYbNH z4w+J#^b;ZnDBq0bG8>EKqmd9x4uyOh!6h~Wy^cqF4PhcT9q1&Z&HE594|27|K1>;F fd&kLb=y(4B0z7;a>O=tu00000NkvXXu0mjfhX-n*TA>HIW;5GqpB!1xXLdixhgx^GDXSWPQj+a3TQxXYDuC( zMQ%=Bu~mhw64+cTAR8pCucQE0Qj%?}1aVY^Z-9bxeo?A|sh+WJvVozYf|;3~p^2%P znW2t?k%6I+z5x)K=^C0?nVMM{nJYkn6417ylr*a#7dNO~K%T8qMoCG5mA-y?dAVM> zv0i>ry1t>Mr6tG=BO_g)3fZ zE`@j@w*YQzUNJP7fB~jokyxN_sAmB35=^15FMg%Dxp39RB|)hO_hL1;IHa;5RX-@T zIKQ+g85nVC${?!>telHd6HD@oLh|!-V4)b0kzbNuoRMFk;2dnGpb?&#my%yztO-`{ z>ucqiS6q^qmz?V9Vygr+K`%2i#md~=+`!z~&BV#s(#X)z)x^@o!r0Bw&D7k`)y2%r z+z_VMB|o_|H#M&WrZ)wl*A%B-P*TV(0NU)5T9jFqn&MWJpQ`}&vQ;K-w;16x52`l> zw_A*H>eUB2MjsThND&Pa0;V1i6P|2=9C*S{%>$k}MOWC#=&Nwyq=E-NgHY#G)brOdx zo}Js7<6(M=EsTMg$KU`mA;TCG5I03VRg`&-cAm|*DZ<~sTsJ?ZbTxlRUgA!*mG>_7 z*lyo&ZvXoD8gK4p%S_(w{!yiUXS;FpA+M(08(e+Xh}_T#W6F_|mdcTn7P`Zoqfzja zSv$1+)TjC9rIWTixmmHw!pcVD^Nh)1i*5fOm(%613%R24@8HIb22o|UTTY3{N9}cL zx7)C(Z<@swlc-k-n=?)x_Fc48dWLhh$xEm8$qie#O%r{3Y1X8QP;2kf?8>j%QP-oM zth^qvQGD_JDU0jxF5TC0yxtqxOJE<$th8g|VbJ0`tFtrvfF7ts@pScbS?83{1OS(F Bn-c&4 diff --git a/vp-main/res/edje/images/button/icon_more_menu.png b/vp-main/res/edje/images/button/icon_more_menu.png new file mode 100755 index 0000000000000000000000000000000000000000..9a5ff34714e0a3d985dd2db21717413fdcce953d GIT binary patch literal 175 zcmeAS@N?(olHy`uVBq!ia0vp^Y(Ol*0U~b-^ehHaEX7WqAsj$Z!;#Vf@@0HVyy) literal 0 HcmV?d00001 diff --git a/vp-main/res/edje/images/control/T01-2_control_bg_h.png b/vp-main/res/edje/images/control/T01-2_control_bg_h.png index 6042922b6efe30535437b88971aafa5629427b91..c64b85b9f0ad4db654ae9cac02376644a31d14c1 100755 GIT binary patch literal 3352 zcmeAS@N?(olHy`uVBq!ia0y~yUh?Bp530R%N1DIE+9Jm)=K z978JN-rlgz3ucsPxp?QpiU^b635F9jG&CmOU}E)t@X*`QgURG$$^4Qa%WtyTC3TuX z&nkYuJA8e1`~1f>HGh9!{rKV7c$`Fa?C^U~@&DuH>93XMsW~(N^|NpYC?FUMloA-$#CZ9m34;_iH!v1B2rDAg!gL1+ z8ZdI=vD8s8GB7mIH#E{WFxNFSurf8bGB8wt0wthrMJZ`kK`w4kyMR1frHqo20xNy} z^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#ykcdT2`;I{$wiq3C7Jno3Lp~` zlk!VTY?Xj6g?J&i0B&qvF*KNf0j6J(SfFpHX8`gNOrftYexnUy@&(kzb(T9Bis*s1Tl+ zmy%yz3|8;!Yvq|&T#}fVoa*Ufs{}MbFEca6%GAKv%+1Bj!rao?z|hdu*wMw(!qLUe z42X@49G%=?dR_99OLJ56N?>|Z5PB_f>IEf*+ybD@E~!PCWvMA{Mftf3U@u!`;&zJ} zPV=C8Q*gV*9H(A=pkwqw5sMVjFd<;-0Wsmp7RZ4o{M0;PYA*sNYlaDr6&M)UE_%8+ zhE&{obMvj=Vh09?K*M9pKmL_Zi$BUAW}cbkvpY92dUTwD3P@YK5c ze`h$eGoy^`cfZ$_ygc#kGS%x@=cS@b-=4Rbo_TWPv~~N7kMBHcoOq--@$KGSX}SGT z%+KE?KlxmGwz%l^^PiTt&wt+Y({|(S_urFwEv9FFiFtQy`%%-|RlYsDj(tzMAGPPm zw&rif>n)F+H!aAKk(ZYbpS?P;*!Izm&rJtqc75l2Q~xAl`>fZK>t4(;Ej|~qJ;I;+ zd6t~vvx%>(-_DVjKE1J6ZfBjl-F&{B{V!tNYHLsKm= z9#l-X+aF)wll?cTY~|y)7gDibx8J@LBX;-Kp0%Cl%%ac}*7@FSnSay%-FUF4?zmz8+s|Lk>*8Xn&-m|VtobYd z_rO=NgRy(=&tw7?Z3*+;gF!_cLoAa5h-%?%08s*J3?NyD84MgCZsMrqXdsNHgwgCU eOv{9NRtW~}63wNq`tiJ=^3K!M&t;ucLK6Trw~)sG diff --git a/vp-main/res/edje/images/control/T01-2_control_circle_icon_next.png b/vp-main/res/edje/images/control/T01-2_control_circle_icon_next.png index a113871f6c4582bb3f54c0e344c31330fc18dcc7..9ce07bd939432dd913bb199ca8d0bc39175cca97 100755 GIT binary patch literal 395 zcmV;60d)R}P)TE1}86?QG7I6^ZH0um!{mfUw-d zD!;sN%tj3qqPYMN5m?H^TMdQV(8?mYmZ`LWAnJ>Eq7@A8sAv`0Cg=nALL1OBPduj! z9*Q2)5wN6H6r0^8d@x#H6_8e*`s@GTvFNdgimuG0b6&)&&{LG5`c{w4bm%}q;$5bm zS*Jn^3i2&a{e?D^(eq pMgHgbLyp)FWvp$Q)*~8#^9vnq)*oMw1f3 literal 1758 zcmbVNeNfY881HU3MNu}UqJqa_J2yW@law~4rG?R^m5N0UdIGu$p$(9OHnj=1U`01X zbVEJP4d%+B&M{`a+4*t6rb7kA339qQ#Pf>_%ymp>3(BmF?Uo`{|3Lp(E_pwn-|urLC9+=Oh@&930RX zu{=B##|*`5&*L%<=jB{NmqBM}mrM1ek&pRp_%@@NMRPc^c$*p17vMCIgXa+@IoEUi zBo`nIa&Edv3u(W9No0KIm;xq=>jD;pjYLj!vc%|&v zzYKDLF%!B#&V3wIhBgIIk`^2g@uQ>k5DWtd!iR+-1cBcH1Q09$A@)V0V4+lmNCjeG z{Nb|REQVZZDykm$#m?m1e3~{(LC|Wo@~zQ)(vkw8j?tt=N0NmB1*GJYG)d)?Wd!;~B98mRJS)hfk!>PM#DGZelCO!j?u;>%R4D#f50l1fA{L-5XsWYq5E! z2BR;iGw+M9CT=fJToju#Gx+?Mb3DSTtJ{u*M+C=4)aUZb-%P@p1^W#NhrNy2n`dT1 z)IX6Am)~svI@Z1Bdw1={rk2k2QmW-)@xA*uB<{aN;oGMT>+6yL+2#uGYmu!=ThOb_ z{O3%-=d3?P?7zUchkx%akMF% zrRDX}H5=|s+2I~+ciSq@SBoDFn`1^V-KHGFBjJNLG2p}-b-}a4Mq|ZWR>~f zwO`v99ug*N@AIl{aqp#^^Wu&_^7>cV7TQ;P=L}3gCbt`$;Ow&E6IFKPvn5Hb$C*K? zkvs_X9Yw-6{u$Z7u9;^yo~a=Rt*%pjriNKhr?@bnY7SSdD#1|ul^%m zO9#{NUASqn?^-&OVq5APD))Ty;M2SLHo@q8`-avg{=CbLp515P|6$IL{T|Qlz3S1E z3pU(oT4E=iu5{lSv^mi?Qcm6(8L4Em+HzreP*(iU&e8+kVPEo^`l~IMa|aP*p$t%Kr3R$I6<} zJ^y|{!LqQ@Bie)KwyxNBWlLOf*nWWJ;yXZog3OYgTb5=>FT)>dnzSXiO=Y5=a4sP(@UJ}$*wEiYmW~3|2P^| KGI~gn{o#Kda=(87 diff --git a/vp-main/res/edje/images/control/T01-2_control_circle_icon_pause.png b/vp-main/res/edje/images/control/T01-2_control_circle_icon_pause.png index 6806d1030c02db734479b9a0e52f739e732aa1a5..d7d02c233462c5d7269745eeb72c31a033fa7fdd 100755 GIT binary patch literal 230 zcmeAS@N?(olHy`uVBq!ia0vp^LO`s*!3HGdYcxIrDVAa<&kznEsNqQI0P^R0x;Tb- zcqgYM1PCNNcsT3)fddi;7})-s8`S)qcH+Q?2h1(~d>dA$r#!fL>%f5nFZvh#u|Mq8 zwmw{V!>nd!TV>|{Z}mD-b_O*&wL0!9ym?h9dE~%{r&`LKY=%8jEh14jl+#UmCJ0~2 zkWh3=Hd%l0P|_9&NnN)MVb+IDyZ`(@@!{z#hL5Ii|M!RFxH!x*<$j)?l*fDUEwboFyt=akR{02diq9RL6T literal 1128 zcmbVLPiWIn7|;H)RfmeZ_~-CQFB5E&mnPW~7Pqu%UB%AQ71o0Xv*c}!Tk>M^YO{eb zJgEb{3JMOrh%mvkhn>BNAj%MiCqYC(&x$WyJ3Z7L49V~P$?yAp-}~P8-7e3bA4!}{ zFbp$NoG~hNEXUu_AjP}KzHiat1j*OP99|?%GeC@P;{^nYuDOIN$h23ly+V@=)3@kU zYou1Xs9M-fn=vOHxjwaKn8~TgH?3tvzyexwJdOSKa+?K?t+De`i7)v%RCi|90yMWa zTea4fEyZT1&Vk8Dr2;M@CWzb>FH|FqZRx6X9&d9jXi>%Ov>UR z1hSllq9n`kED(4oa6EnG6cklSR)ulUepu=)uou;eQE2<3D~+ua;;S6jY&O%)Od1DE z98?q~))0ggWu(GYkC;))3zHoM1BF)L_{6~;h!xER+#niDBi%cK>z7LV!d}=;6ipcy znLY>8JmF6CuDR}dh~ ziwbXu6BLXIA*+i@p<`S0LSlLr>iBi2-?puEpsktgZiZ*#>)AW4fdc0`vI_xrK`Xzi)5U*AlJjs}gaydw;&bacg;xv#>bxLi#-YHr zZSDWb8ApTR;^O$LSUOv@0^{j^>C?r2^B|9QOh8-X$g@q0w$=Tjp;x1wFFP-W8E}}< zlV7)khtnHR-+y@5^KnK^W*&TQ^fNuZ{bTDCN2e(!0L6i$6nlp#Zk>9xyL)5f)}bHr z>*2m`jGq3O7vtugpT91T-uvWk9v}Rt;JSJ>!83194?KCJJ-!h4elb65JkMUa`5XA% BQ;`4w diff --git a/vp-main/res/edje/images/control/T01-2_control_circle_icon_play.png b/vp-main/res/edje/images/control/T01-2_control_circle_icon_play.png index 68570acc3a7b0c1b3fab34bc183c70f1ded41f35..5593cb79e1c40337664fec1eeba928a3a4d5e1ef 100755 GIT binary patch literal 476 zcmV<20VDp2P)cIsZN=(icz<{Zvq^fs?-*1Q`UVHc z#1ExpB`9Tcntu}3=bD8AZway1e=aZ@L(bqP%)b2L0=ezb{jKRw)0y5rabbJ9++H>+x zy(Wk5wxeQkh0^u*~_@WjrD&mw;(?< Sa$z+90000afV{1}vLk1Npj*6ZyG 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 literal 1537 zcmb7Edr%a09A5((mGOy=k96D?9KH1RZtuyhoOE})7uT={9;ciRn9JP{ZsTtE*xmCE zGRtR>lZ=iwsi0`XA2p>#Q;C{jUQ=iR+LT#LV`Kx2<|7|yG0|@k&_5h!+S%RTW51uz z=ll9?O}_hu3FBvvM-XI!D~IyH5m%nEPs4X%^CB}GX34ZqE)YuP7%KwA77$7R>I$=E zzysJoWknmvLXe~*oYyD&m|W5?gmG4}!Q-` zVueOV%S0R?$mLXtprFd_^;ebqEdeZhDVh~0Awd|(EE*4oc!`W#u_0a(&XsKqh7Os? zJtfG?*Nnq#$!;pEd)rM0m!E+rP*| zkTJb3%I1y#eDxh>VKO`O>sZOF89O#5?WFLcxpkM(1kK|U+rMPSH8+35oH@m~+%He6 z%h;DzvGaV!8$UefT6S{v;DU|>@9(L8u>Yl&((KZn`=2gZax3e|{LR&UGtX8( zQ<2Um-a7hYH!-yz+r0OWHA!_TcRcv^-;EmzZl*2qR&=gH`&LIZ>(h?iOZAOutjy_n zebSCSonHw@JEsJ1sESfP+wzKi#`WY2MT=AZ&S?Clb<4f%wY{&oL*=dbjDh4^t!I|S z$7a3R_3`eao0hw=5MQ5qZ16-2e)(PRz)$q0 z3As1_xpPVD>5g~xKHHS^zHOZE?abm`HJ|6K+g8}Ht$!Xe=~#8@NtU@$w%6vFQL$iO z!&AF980!@XGiFkBMtZ96A!_-h;hTC#*e_gG4&h9HmL+2Z^ z543%dA8SVsI>R;m3R|LaD>&PvtC}7npYH;NJAKLNOIO`Z(r%yK7piDH-PCcdvu$o~ zP2!`)7i+&CXzr+eZ~6Xc)xaV5eO=n*LA$iBz2I&nJ~k_TN6Ya-;X{AExMJFciQnlynPTpCc2!?d|Eq3AZXZ7F^4|aTH|3}7qTSSC I`P000>X1^@s6#OZ}&00004b3#c}2nYxW zdCE|=mnZ}H)O%SUQ{ZHR25E8P!B-5>kfK? zgcCG9L1B~7RZ~?gE7B7*y#d6*jtH5r`o=blg9!%Ji^z6n=6yf!z0ZV4Ub&S)xSAjWp-Le0&Tg!|CI%rQFz`1R`87KT1ClRpxJoI* zg!GHgr!#VeifR8BiW>t`YK@s^SDMz-)={BU?-S8WW*jkVLqUVCs79bx%$hU+r&RBN z=p8c)(|%3H$Lne9$SF5Cq;5L1-lT_A;Wy(vM2R5rhc!uNo56C{YsmPAX6qco7{@f z);i>)QtCA`YXBmAyeMkApE!dgfa$Y@>7TrQ_n-vrTD*(`Q3 z@w%O~QUWr_3hlUj0OSkhdY-2mWc>1aj4lMYIl?ZV^ls72NjPt4j_JcGEkgOW!ZNCp g@nkSR4ej;+0H!V@IRA?ve*gdg07*qoM6N<$f+C}5>;M1& literal 1690 zcmb7FdrT8|94|glVG4rTgH64jK?*{z*Y?_SqmZ_D6#^A(8$jc5M|;2xdROiaS{R^$ zAsT`x(`_0YGC@aNzzEZAIN8QBl&}f95GTY3Vh!pP8H>Tk+!X=+!!{S+{nvUx=SbBwCyhkC}y0>U|da3h%V<)~JQy9Uf2TEld{gB3M$Svoo0_kl-M) zNi#{rr<;;c8{?1?UK^>~;S|s!QB0iMN!W5p9>^rKDOwBO@8|>p z%B}^|5R=U0G>|z|d@)N}iq~0f#ksaC|HRiDpalprY}%X zW9?a}88c362`ep_!}CrQf?O__)TNLzY&HZ(M@M@(0}9MgWQA@f~7KuowD)9H-j>nUXO4% zX018iOulgbmHeEw$VozGl4A;3n^489RWC`sUdU@W9Rq42*j!SmqLIks$f*w|6PheI zPtimk#@GrRB+VyaTCkvivZD%}5y2E{9MKqbxKJC79yelY4AUDi3{mLt8G@IAf|k@S zU||7=E2330gI*28xKabFjXFf8hxKX=BF8i{*aVv63ED<_MZH++1r~WN7B#RW!85Ft zVe)3WDJ6&D87_x$0tSl;kfc$xopEvD-ck$PLZ}$YQiY`5$TALKD(fiq3VpRkXH*;X zD!t%6u7qK|L66`@ScxlC1|cRGoW|P!cfugS6Uf_TFLm9_me9)H>FgO27PF_2q=llf z!WpYgQ}&8PbG9X5I;;Eg-ThY+t-57fe>m{X{$*stA##0)IiNogy9Na=63>GhK(Oh{ z&LiDQeNbrMjuj;fF{~t|{Lq32;w^zq<*|+Fm5uFXVY`lR;vZ(XhC1eQ*KIBLoVPl% zvpsd|p%pc^F1c@d(u!|wfZ@Y~>LTbBD>IQMtV;fmS``_N!YPuu2u{b8l~T^G8k z%UDQifO7ba!rHT6zr8y)`J!L99OzDwof@vh?X@@%Dg= zL)(t6zZ=0^58K;iu}kOejm0n08`0yMr5Q&?%flsmTi{ zY>2D*aZ_qjiD|{H!bwT8TwH(Zwz}W{Fxqqi9BzKJxqp69B^A2oens5LWgGB5-9)Q6 zuB$YxchJ1tV^EBrcyplP-PL&!xvhy4q)%|^pT@`6TciGQ@5~yE7&*${jvQonYrv++ z@#>8|XUd`dk`qZEn8lwa_^y7m(!HlA34c=WGud`PIPA|5OZb**PlwOs9QW3ezshn; zptCEr!RPDHzEN$)#$va{2Mvsk4j1V0DtA#j-;Wqnp2Gu zM`(|KO7orU_@I5(hUU{t^4_P000>X1^@s6#OZ}&00004b3#c}2nYxW zdCE|=mnZ}H)O%SUQ{ZHR25E8P!B-5>kfK? zgcCG9L1B~7RZ~?gE7B7*y#d6*jtH5r`o=blg9!%Ji^z6n=6yf!z0ZV4Ub&S)xSAjWp-Le0&Tg!|CI%rQFz`1R`87KT1ClRpxJoI* zg!GHgr!#VeifR8BiW>t`YK@s^SDMz-)={BU?-S8WW*jkVLqUVCs79bx%$hU+r&RBN z=p8c)(|%3H$Lne9$SF5Cq;5L1-lT_A;Wy(vM2R5rhc!uNo56C{YsmPAX6qco7{@f z);i>)QtCA`YXBmAyeMkApE!dgfa$Y@>7TrQ_n-vrTD*(`Q3 z@w%O~QUWr_3hlUj0OSkhdY-2mWc>1aj4lMYIl?ZV^ls72NjPt4j_JcGEkgOW!ZNCp g@nkSR4ej;+0H!V@IRA?ve*gdg07*qoM6N<$f+C}5>;M1& literal 1661 zcmb7FdrT8|9IuZt9zsfh35x8fx(Q0J*LP0}X?s^Gp-^k13?Jicf6x=!t9RG6ASxi! zsGExnL19idx1mA7xg~RoF9I{j!^bvsMk3(iTr@+?GFT$AI|TF(W3tQL{T}!Id_LdT zFSpZ@xhynzPOv~A2sNc)R&EsYPhbG|UiIT*6*t7Ncs9F&%42;54Foy|wH`nw7m*LF zfN&IT>;TCE!Hj0omd$3HGf+F_5)-_Q*zfXiXn`O()$bwf1%QRtgM8Ah6%Cy^FM>#i zR*8x}$1 zCTxLL^xUazvjs9xG=LOhS(06XAdpfiM&t^m5?KOCC5RN3aJMoEk)sMFDpf%fmxxoN z9eJn~Gfrr6E3L@MvK|zMeLkPqClgb2K8$EI8lFQcP2wz)m?Aez_>_{aZTR>mQD*b&5iZx1 zHN#rL3+G?S&)AAQ0JZ{#^3ry$ih1*2l6t)mZ#WSHY9{Ccz*W&m6f$7^gV~H`an6%& zq7b9(UKen)CQK{xdPxT=(-{?*Ooc1d1|81TMyioD@qjPRaurRw$uGt4Ozl@-Yc~sX1;gR1DDM2f$&ZDHk-Jb(DOCzDlh#stkIi zUMVr)as<&E^a|XF$Z?s{fXg(9Xaei_-wA^`Phh^wUh2BZEv}XM>C_qG7E`AXxVfUy z+!@)ZFICVJZ3>a<e;nV5oXeME>ASVgCISt;ao!ZwLR-I(u1b4lF#C8r4nC9S}eC^-!I|m_KrU zL@_2WdGCgWSm|p|V}nX8*P7b=!pExIq^u)xpBqlsbtIIP1Z@|d*S6ldIla#lGT7IY z_-<}&SnIO3nx-c$eUIj3ZnB1TJca5u*Va*#ML=b2+)?*M z1lm70w$~#4skirj;ZOw{`t_Y}MjoHta4hp;MCif#gpi%bZ+Y9BGn{=xQu2)jYkkpH zMG<^@VM$8B;O>El*yXGH(>up5-vhJS8gy^3IeZic-Whw({ryWj))U;lXx-{9_{^Hv z((f`Z4|}7|?P@={ztMQ0JMg3G(PbZv-lQM5NMnfIwDFz&*YBb_HkZ*+6@<;(0G b7@HX_AWv02Yw0~W$o~*bcqZ1Q&n^ECTWe|m diff --git a/vp-main/res/edje/images/function/T01_2_control_icon_screenmode02.png b/vp-main/res/edje/images/function/T01_2_control_icon_screenmode02.png index d56760cdb6772ce4c442de16bd6edb2ff01a589f..fdc12f62381392579bafa4c24c4487818b04dbbe 100755 GIT binary patch literal 508 zcmVYEkl{K40I0v}T8Vyop#|gul^Q2G#=#UvLO6N?Lgsl1A8ClnH zCih~eGUYlcx&mM?007*M2kn|4Ae}R7%zU~6#ppUCs~Qzn;sUsl^??ANN3%YSoS%p& z3PdPCs4yA5@o-!OI+64e3SeYPMWxh}yE{ftvtDRp&dQFubFW$(0WkBkGqkqaA9es6 zRsbz$*uIFO_MkQ407j{x_SLHd(2UE;u-%9XAYYWM^$Rx?Ko%HAsW4Bd{7)2bWX*~q zJh%Y9zVR)9s5@Tnq+ZAKciJ7mf2}|o|S^Rha$2u-i_Urxinv1Hu$nNrxS`Ik&7x&Fd6rD5l{ yjgA-;!?oq|^5e&(PDHB)GzJ3M`AnlGbLJg;(N5BuVI55X0000FL~Ya5$pG~QX6E1fOm|ynXLev4cZCJQ#(3$l^Y88mbJ>}} zUG{+{)M$vUn)*U$YE4bN#n?b&=G@&X{A1I!lrz*IgxKqFfwuQ0PfGR$bbrM3D2n=n#JY<#Iju$oeN@$z?W6* z_5iU$DjsRTdEJD#o1|+Kv%X2MuTnI4Ig%3uxBuWodw~J_Pb+%1JgR zh^xNPEkLAg+h8dwo6VA0C#jn$3NQ>q(GJSts6`sJR+nZ=xmwMtELsqtl`s{Wxt*df2tdf`^Llt6EsCxXU}!hzD`LZ%WlLHD7X2#7 z?<&@HM=Z;mP_lKiS=T#?9ng^0ZQV-i2F^FRNr1O1nyhE7LU~rA6`-j+17*?FReU+W ztg?ZB8VEig$8cWWDTbT?FkZ&XIXJ*^4v&-L-NY(Z{y#aR5E-h_9P65;C_)`rIIgum zx~vTk)X>D3XfzCR=ro3vbcY45Irr@^-*M5S4_Az5CSK-V`Z|CA%uwcPNqpev3&*pW zYbE}kEqI@?{pvgI*Y54nPYewVG&s)rZy%W|JrTR`_n(KJqrd5VA}gvhOzEfCrgD01 zdA}umW%I?4PMv;XvT^?pBM&Z&e0(ysH)GY?`5Jmi*_=KBe?ODUOWC>n?w=ed>Bgeo2~} zBL)xeu_iOqFFv+=*Mwb_+}GP{CW*)S?uRBbXGbGdMKXNJdSY}1lJ6Wj6KEa0S#xr9 zx*8CJesRnA#m_3i^U-7bu5@SdL%vU+1u|`|B$MGn*MbH(;ukbbNlm(-oIMMhD)1{C!!0~J@xA{ fL%-R0<*st945TmpQ@1r$_``)mQQ^Jd;huj1WUJXw diff --git a/vp-main/res/edje/images/function/T01_2_control_icon_screenmode02_dim.png b/vp-main/res/edje/images/function/T01_2_control_icon_screenmode02_dim.png index d98a961b529d3e932caedc2dfd9505cb7cf93ae7..fdc12f62381392579bafa4c24c4487818b04dbbe 100755 GIT binary patch literal 508 zcmVYEkl{K40I0v}T8Vyop#|gul^Q2G#=#UvLO6N?Lgsl1A8ClnH zCih~eGUYlcx&mM?007*M2kn|4Ae}R7%zU~6#ppUCs~Qzn;sUsl^??ANN3%YSoS%p& z3PdPCs4yA5@o-!OI+64e3SeYPMWxh}yE{ftvtDRp&dQFubFW$(0WkBkGqkqaA9es6 zRsbz$*uIFO_MkQ407j{x_SLHd(2UE;u-%9XAYYWM^$Rx?Ko%HAsW4Bd{7)2bWX*~q zJh%Y9zVR)9s5@Tnq+ZAKciJ7mf2}|o|S^Rha$2u-i_Urxinv1Hu$nNrxS`Ik&7x&Fd6rD5l{ yjgA-;!?oq|^5e&(PDHB)GzJ3M`AnlGbLJg;(N5BuVI55X000084`N!!%?B_(H8Gu zAreFh*`kSa;md--EKA%X`e8cbj9bER5>OX(nk>d8PG+`f$Xv2%7S!i}Lq3pwut}fi z|2+Nu{_p>ew>CdlQT{|ZhG7+vJwgoaQvTgmiq<~z=TWph?ubdJ&FpfrvIQ|-HB%6e z=yDpypsWt`&A|o?EAGx%6SZ#(=&*TVGT{WjI8uP2T#GYW(0}lv*!q0 zQ-egp8>OR}FznX$3|g>lusN;__9(1MG&SN4ISwh%p(Eotz1Oh0T##7R%ON>`O%eDi z#OVnVYfdGjt$5h9Anqk;mqPmh?(>kqL$e;X9(U7#rhuEG{VqUrUOz_zeElJiHB0T{ zVuG}83!Q>Qx8r0uipplQWR@XKD@_5GWhvTCx!o>=aM=TfBj;R(y|bV}fVN_38Ame> zJg-qsnf*?XK%TCJpl71d4aJ7No+y+uDkoP2~b1mJWq^kCzFBMK=IE z5J5;3{ceU8LSEWe(6JR)5@^=Tcv(gYga8m3Rtf|}QS$jcVOj(}slbgGwj&z~EZEhM z-F0r@zFaPBLD?~_xM}tlI-s@NbWFS3%;4cRFA4C3W~gS?&X;E`S^-+x%TSdpQ^!~H z%V}HKr-2X%@GS2SGm^*v!1`G~@8$u|yL}8F_7dw{_5b9ILe5b6=GfFMg)7v7d2yrl z(P3kFpn)dFLZk7@XzCdZE9!~}d^~sMw;x-|M|M|UymjJ2N5@nZKlb2(kFra_Pj{Ey zz;>LjdTes4-5D8q0DhRR6r}z8emS-L>evqQ*qcrNj4HL?+%9dOt}Qu_6>q0EmiA{q zc%}XUcY6yxBa*p7?5LVPbmknS-g5>fuKpX&bxn z$rYwQvTeMmw7PS+u#|6-JBO!+2a;b;?z+76!kvM}?c?tar7DB-wczUBh0#;7Yo7Pp zSLTm=f8Z|N_vDMe(~-B5ztVE`)9=>B4z=|je7NLZ`UihIbDUykmKtIGq3J&^^&U^p zmQ64-6N^2wb+aE+$7;T)zI`O|)K4{kemAsm?(f;6&E8yZx>xd;oB`wa|`9E1i LY!;?Nog@DOzlO%m diff --git a/vp-main/res/edje/images/function/T01_2_control_icon_screenmode02_press.png b/vp-main/res/edje/images/function/T01_2_control_icon_screenmode02_press.png index fee5177d06178407b62d923bc1c9e1a62f4e077c..fdc12f62381392579bafa4c24c4487818b04dbbe 100755 GIT binary patch literal 508 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 H*vh{FU{>v! diff --git a/vp-main/res/edje/images/function/T01_2_control_icon_volume.png b/vp-main/res/edje/images/function/T01_2_control_icon_volume.png index e4424a233a7014b4e413360a73fa8b14088e2d5c..107d42cd3f43b8afe069c17f931aa8684a5e6c81 100755 GIT binary patch literal 742 zcmVX1^@s6BEU{300004b3#c}2nYxW zdzaz_9nfiRjf7vd^##%Tta>b0o#sH(?{uTCf9yC-& zb(y%67FnBPv97UBo(*Kp1^;xLmP1BH(Sr6=*)KLUU zmeuCaj5%^`I0`1{w#1PcdRoxswzS!nG-h^gGB#$D?tu znwX_4#(OMa*%&#AtgC40c74~s))J>}3o#)PHJ<`%Xm$1gT=H2a2)AY3m=gb&1*|2E z)>y}sn1HjRZ~VBC;t~UpH#J+k@M!Nen}tk?f%Khe{&(*lZacXQHBL~PO=rV>-btm# YKfqd43@$i?+5i9m07*qoM6N<$f&rUN*#H0l literal 1646 zcmb7FdrT8|9KY}|6Xzp>%yo#jbL!aa)A`uOP&WiJLD_V;_&}wgyCR@}7?WM@?)SLw=kxi# ze!0!2v}Mzycu@cVOgAK>W^NROo>!)DZ`;v#72NPTi)FCsbPnsoJp`a}(AflNaN)Ux znZO+dYkwpX0U-PkX~|$SjH!s7b_wv1jll16b7%laO!B*Ndp^N}*+ec$siE7)TOp8i zs3DuoC^EWrL>`$O@DS;NG>biuZ&x{>q@`e@AK?gG1dD@ymy==;zZx3jMYwrrTL^(; zCTzYMdg@e$(FE#f4*|*q624so!=PL)fTc3I99{y7MX*>X;%+$~mLf7aB36Lo7sRP~ z965*?)sJg&D>anIvTj5u^!a=OpF}`=a)q!;r3!I~#eB|!&lFHB?&nj?f(ZtcVC){! z&5|?)h8Xc|+RLgT&eNwMxZGwkH;-i|$th+$SzOwLe%vjD1tOtm%qA4y1j=Z9Il|?d zv}RZ{@yz)b@-vnKHz70=4DI#Uxhm!?cuwl&LLtNP7!V`w$tSof>TxGSjD0W~krkZt zB!xRs+U|7`6l*}$kk?B(5Q#=FLnR7KrqpRLt~N?7rbiVhs@0>YOrpUi2%ZOWS^@`$ zmFhI8LXIj#I;{eRF{x6a)N5f4EW+e+l}@9Xz#1rq#VI=x5)EO=XIS}5v53w?;4JO2 z(6n=+n@o8$OEY=28`P!C!MANB<)D2`La5XnHy0{Oc*u2xL+_zo;8@lX@&)<|rADvN zY2{kZ1566TTAfyg>0v1*k?Syt3Wmn9j{lu7A?JxO)Md|g-NY8x%Ax7x8R8a`r;wny zqItM8RyR1e834kp22^A5|9-3LLVmO+roHL#l+`kK_Vj{^g>ro8Y2WhLdS-+`>rrsUJNf0;TubhN6)QPe`j z7glX6xSNx7{HMY1t|*r`r1JRHhK5Y{G^&l?5}72v9og~0Cro!~XYFG^wfo|-1N*Zw zPeioGg zpGL%~a%dm{{vy}b2V*0<*7KeupBywf+alr@NlUj>Jciol zG(2encJ8?x9oz!P*`yjP=cEgN$ z?PP62`lYx>>-)}z-K?O5Z)J9hd*?nX>$`!SUvag@FuSmPWJTZ1&wFO6{?YEQdZooS zy7_*v?!;7AMMuT4(XAbGio%-}v9iWTzL?|MjhTJT^q(6z{ed-Gb|;uFxi(h*dTc1I zzU{(Vsc!g2<c}I#v0Wu!^G3D+;XuEHDr*jw QEeZVr3|Ja^P`kS1KR=RmmjD0& diff --git a/vp-main/res/edje/images/function/T01_2_control_icon_volume_dim.png b/vp-main/res/edje/images/function/T01_2_control_icon_volume_dim.png index 8d525b8952dce570ef6dcfe7384bde86e6ad62a0..107d42cd3f43b8afe069c17f931aa8684a5e6c81 100755 GIT binary patch literal 742 zcmVX1^@s6BEU{300004b3#c}2nYxW zdzaz_9nfiRjf7vd^##%Tta>b0o#sH(?{uTCf9yC-& zb(y%67FnBPv97UBo(*Kp1^;xLmP1BH(Sr6=*)KLUU zmeuCaj5%^`I0`1{w#1PcdRoxswzS!nG-h^gGB#$D?tu znwX_4#(OMa*%&#AtgC40c74~s))J>}3o#)PHJ<`%Xm$1gT=H2a2)AY3m=gb&1*|2E z)>y}sn1HjRZ~VBC;t~UpH#J+k@M!Nen}tk?f%Khe{&(*lZacXQHBL~PO=rV>-btm# YKfqd43@$i?+5i9m07*qoM6N<$f&rUN*#H0l literal 1917 zcmb7FX;2eq7!HS6P!RFJD%v&3Axe_Xoh?C<>;{6yMu-ImstL&gF(ex{iwRg2s2u{{ z7QuP|f)1B})nOErLr1NO;|ZgJS3O2XqT<1b$JA~R)E|yB-Pzsm*!Ov!_xfh@6$>Lh zJ*Ik4C=^dw6dXg2G{^Iu8~KiFn!_W9?+GNHh{ci#iyB8MA}yAL0y2X-1&u+~+RXH` zXc&d!(x6ku6Y=r|kOni*)D9b()nFpg6iV1Ut4XcVqXdwIrs#}9>a(M5R6wT{QsX#s zhTJ4UQ*}{UI2xO^P^rn%YXn;Ayl^1Q3Xuc`lu!d!Lz>YHS%uUgUWlAKw&_%0$b`@f zsUMw+mn#4XhNA$7#tPLiKoH<^X&{@!<$`koCIe*B8RX3k1=$dX3o&`X@I@unaBVUa z151as$d!n9NYpBGjB|B-GYWquGCi0Y=RlTxTM5 zm=SO=s*|t`LP#Y&{TPD56r)Q?CCs15jppHGk!hn_)h0SfW6<#-8%KO2D7pOG2!r91 zwV8-PKRf?bezP*ugwkVBGnRpC$SNlLert|bQgxac9r_@bLqCzu z>x}9&7}I1JP$MCOh184;ofcw=q#T&VLpXei2qA037b8-b2g71140Bi_WQ5>LAgM*u zl2{JN5lIlXfFTj{KoDW`r6LhuBt>8;Lx8YF>=CTYXeQJ~4eAheV0E9d{BL3*3681> z3|C@U+DJDkQZWKEr(z~R63YdG<8($XW--rpl$zuwLxoXXw*u8lam)Y=WgXIeMW07H z%9Dt>VlIOW0R+VoF$a-?Y=p&?AS?k$9mZ<^cf#nTCv-=bebIFzTVyLcrk~Cbx%hMn zQ6pJ2oIGP;>sIuVM^`I@MM`V8eThszagq1av&n2ov|+wi!N%PD`HGVd%iR($O?jmX zdr)RI3G#U#a_6=G(IM(AD{G2kOr2O>k{e7rGCjG_Y73Og)`J&RryInaU&B^HEa5HI zSmJo(;@5p~&sK5*-Ldg zw)m)9YH@^Xw4clV9LRlc|6`ZxnVFZWCmiUEn-8269r3$9<|RY1O>-ysfK#yli#2W*^B zI{Zwt+pK)m^hVFEEhldJ<~L209MzwpX?u zi&Aagr0~tYnCX4EV$P%O9jB9u42Krc+bBOIw$(m}T0PMvF{i2LeqT?fDxm*F)c7}h z)3ZzZF5k~xL+{vns9m`Ia1}d6n0~iO)SMW5X6XTDHLNNPx|>*Y7f}UYJl8EvC>v~^ zHaL3b=HmO00`4|O`hw^5O9pv2!|yDP4=?cQ%X1^@s6BEU{300004b3#c}2nYxW zdzaz_9nfiRjf7vd^##%Tta>b0o#sH(?{uTCf9yC-& zb(y%67FnBPv97UBo(*Kp1^;xLmP1BH(Sr6=*)KLUU zmeuCaj5%^`I0`1{w#1PcdRoxswzS!nG-h^gGB#$D?tu znwX_4#(OMa*%&#AtgC40c74~s))J>}3o#)PHJ<`%Xm$1gT=H2a2)AY3m=gb&1*|2E z)>y}sn1HjRZ~VBC;t~UpH#J+k@M!Nen}tk?f%Khe{&(*lZacXQHBL~PO=rV>-btm# YKfqd43@$i?+5i9m07*qoM6N<$f&rUN*#H0l literal 1919 zcmb7FX;2eq7*2}_LXnD95fszlfkzTHAqOj|CfURU4MGS4-b=EOl_VQB8%R(>P>y&* zt<@@rI#|)6hzExkGLEfBD=F3SfVS9xGL?E(ypL`W)E|yB-Pzsm*!Ov!_j`}o)v+P&42b1r_BU5?gFq)7g5%E|mkp<%jMX1425UN}cry)uN)>t#n zAyE{H$9`0mL?kKZfND(7fZa9>i{410DU_%g79*@qM+j;Pl7<=tw7bVn(x|9LKuhE( z!WBj_qD5udI1-;7qf%$5t0OhE8DCMOEFejsM+lf|(d!H*&?2Dq@q*;sz0IUi`%H** z0qu=bNs3si7{d`Nhry<+!vTQG4wnl|qq4#Q7Bif@xpW``FJvz=#5G=O-q>Gk{e9@!6L)Pw7^CtzzApJeKzj%4WJZ?k0bQ@ zx7H>?iM(_EgZw6y)rc^ahzT>}YBGzdq3=n3T*z(Me+Ezidrm zf#E6)(+yNptQI3MlNK{l#qnHfSR!iBU|FWg?o^Z97$P6vy<`zNmxfhxGYE zDNiioin!roNdy3h#3GJF3PecQT(N{53DEknn*SXzCg};&U1jf8-M|)E%I@jg9wHZS zyAUyuNyEt=8_{DuM7D0K91^N5ZT}==S_K?b|lPNGG=qJMHV$aB*1^Qe{@r#S8L(^@7tH#FElT^ zzGu;E)rCPnJE5vGE0+7+nc=+Y80C>@XEz5dEnU@Qva_U9ZD$|qhE;e*xk@rav+}m< zHhOInHeJPB!FiKr7A)}cUOyvtf%fpzd7jRNH&?5nLU9?T#KQgRGpeQ)V!A2{Yg($fsgmBy!l&)6iqFZhmEg}EA>C=mGB&>JKk30Gv?Qa zBLWwz23_(Rxc+b3FzND{Mzj;z{MGNQ!#ThPen@q9eyh59Qc-2- z8YAs%vJ?|G$M_LZ~;SKXx@8m!cuJG%QD_74-7`D5c>ED(?fKesj~NE@JMZCb2+*|qUR#kYLhZ9{oWfQNRrxqZU@@ws--De=nl6}0l!f_ZgG z(Zg$cGWHF<_O$g&+qlf$C)w8v&t9$zYy|JuL|0`t&DlY}`K+@tC4}GNIk(}=y(1H4 z4YPlnR+OK^4PC%H-W75?+U^zN@OOZzCEKnAIvsT$%UZ6M5AT|sH_apFC;@m}m2(_z z_3H~jX8H6T4f^s&rMG4}GM|q6EI9R8;Op+0j+{7!ZC3TfQLRmXI6H@&U+HV#5;EA{ zxNt<}xhsF_#(2j)JyN{nj&z=*@s%`Kvo5m&ODigj-Z0eMmNY%t3R;$H%f>dK@ iq@lmYov16Am(9NJU!q(R1J#I@uKW)*^6ilT diff --git a/vp-main/res/edje/images/navigation_bg/00_top_bar_empty.png b/vp-main/res/edje/images/navigation_bg/00_top_bar_empty.png new file mode 100755 index 0000000000000000000000000000000000000000..afd795d9130c6beadb6519cef4deb1f6f3b476bf GIT binary patch literal 2063 zcmeAS@N?(olHy`uVBq!ia0y~yU{h6k4qbHb+Z zg-Aj$MKz4f3*2EGB&`Bs1`KVdMSIaq0;+6ayugp75M~(%w*V0gif z#pV`Po`#1-uF5b25ROP-_`;0re5lMJCbk0wI~NHe6vDI`F#JOGFhofrBXh!zn2T8K zmSFgc=`n`J4GoM2G3zq0*v->Whv~5fhlm3V5_;h#D1i;Jo6W%<<~k(zD(ECI@J!d1 z!s1%y1@cG=VU~?X14=xNMgu%CkLCvC>@r#?!Sl&zp@dQ#55l^Ezf?(sK|>(h4OHKI My85}Sb4q9e094mlQ~&?~ literal 0 HcmV?d00001 diff --git a/vp-main/res/edje/images/progressbar/T01_2_control_progress_handle.png b/vp-main/res/edje/images/progressbar/T01_2_control_progress_handle.png index c4e7a4fbc2c11486f092222a477219aa82bcefc8..34baf917a1fd6cc6f603adf960708919bb65929a 100755 GIT binary patch literal 488 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 fe})3GEqpgt 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 Ef|Iy2)&Kwi diff --git a/vp-main/res/edje/pv-custom-winset.edc b/vp-main/res/edje/pv-custom-winset.edc index e0022c3..17312f0 100755 --- a/vp-main/res/edje/pv-custom-winset.edc +++ b/vp-main/res/edje/pv-custom-winset.edc @@ -21,6 +21,7 @@ externals { external: "feedback"; } collections { + base_scale: CURRENT_BASE_SCALE; plugins { plugin { name: "touch_sound_plugin"; diff --git a/vp-main/res/edje/pv-normal-control.edc b/vp-main/res/edje/pv-normal-control.edc index 83d93c2..ceacee2 100755 --- a/vp-main/res/edje/pv-normal-control.edc +++ b/vp-main/res/edje/pv-normal-control.edc @@ -15,6 +15,7 @@ */ #include "pv-image.edc" +#include "custom/pv-custom-define.edc" #define PV_NORMAL_CONTROL_BG "control/T01-2_control_bg.png" #define PV_NORMAL_CONTROL_LANDSCAPE_BG "control/T01-2_control_bg_h.png" @@ -25,7 +26,7 @@ externals { } collections { - + base_scale: CURRENT_BASE_SCALE; #define PV_PART_DESCRIPTION_HIDE \ description { \ state: "hide" 0.0; \ @@ -77,7 +78,7 @@ collections { description { state: "default" 0.0; visible: 0; - min: 0 12; + min: 0 6; fixed: 0 1; align: 0.0 1.0; rel1 { relative: 0.0 1.0; to_y : "pv.normal.control.bg"; } @@ -92,7 +93,7 @@ collections { } part { name: "pv.normal.control.bg.rect"; - type: RECT; + type: IMAGE; scale: 1; description { state: "default" 0.0; @@ -101,7 +102,7 @@ collections { align: 0.5 0.5; rel1 { relative: 0.0 0.0; to: "pv.normal.control.bg";} rel2 { relative: 1.0 1.0; to: "pv.normal.control.bg";} - color: 255 255 255 255; + image{ normal: PV_NORMAL_CONTROL_LANDSCAPE_BG; } } } part { @@ -155,19 +156,20 @@ collections { description { state: "default" 0.0; visible: 1; - min: 0 46;//(26+11+12+34); - max: -1 46;//(26+11+12+34); + min: 1120 50;//(26+11+12+34); + max: 1120 50;//(26+11+12+34); fixed: 0 1; align: 0.0 0.0; - rel1 { relative: 0.0 1.0; to_y: "pv.normal.control.function";} - rel2 { relative: 1.0 1.0; to_y: "pv.normal.control.function";} + rel1 { relative: 0.0 0.0; to_y: "pv.normal.control.bg.rect"; offset: +80 +16;} + rel2 { relative: 1.0 0.0; to_y: "pv.normal.control.bg.rect"; } } description { state: "landscape" 0.0; inherit: "default" 0.0; - min: 0 46; - rel1 { relative: 0.0 0.0; to_y: "pv.normal.control.bg.rect";} + min: 1120 50;//(26+11+12+34); + max: 1120 50;//(26+11+12+34); + rel1 { relative: 0.0 0.0; to_y: "pv.normal.control.bg.rect"; offset: +80 +16;} rel2 { relative: 1.0 0.0; to_y: "pv.normal.control.bg.rect";} } } @@ -180,15 +182,16 @@ collections { description { state: "default" 0.0; visible: 0; - min: 0 70;//(12+70+26+11+12+(34/2)); - max: -1 70;//(12+70+26+11+12+(34/2)); - fixed: 0 1; + min: 80 78;//(12+70+26+11+12+(34/2)); + max: 80 78;//(12+70+26+11+12+(34/2)); + fixed: 1 1; align: 0.0 0.0; rel1 { relative: 0.0 0.0; to_y: "pv.normal.control.bg";} - rel2 { relative: 1.0 0.0; to_y: "pv.normal.control.bg";} + rel2 { relative: 0.0 0.0; to_y: "pv.normal.control.bg";} color: 255 0 0 125; } } + part { name: "pv.normal.control.toolbar.rect"; type: RECT; @@ -197,18 +200,20 @@ collections { description { state: "default" 0.0; visible: 0; - min: 0 80; - max: -1 80; - fixed: 0 1; + min: 80 32; + max: 80 32; + fixed: 1 1; align: 0.0 0.0; - rel1 { relative: 0.0 0.6; to_y: "pv.normal.control.toolbar.top";} - rel2 { relative: 1.0 0.6; to_y: "pv.normal.control.toolbar.top";} + rel1 { relative: 0.0 1.0; to_y: "pv.normal.control.toolbar.top";} + rel2 { relative: 1.0 1.0; to_y: "pv.normal.control.toolbar.top";} color: 255 0 0 255; } description { state: "landscape" 0.0; visible: 0; - fixed: 0 1; + min: 80 32; + max: 80 32; + fixed: 1 1; align: 0.0 0.0; rel1 { relative: 0.0 1.0; to_y: "pv.normal.control.toolbar.top";} rel2 { relative: 1.0 1.0; to_y: "pv.normal.control.toolbar.top";} @@ -277,6 +282,7 @@ collections { PV_PART_DESCRIPTION_SHOW } + part { name: "pv.normal.control.toolbar.screensize"; type: SWALLOW; @@ -285,17 +291,19 @@ collections { description { state: "default" 0.0; visible: 1; - min: 60 60; + min: 32 32; + max: 32 32; fixed: 1 1; - align: 0.5 0.5; - rel1 { relative: 0.05 0.45; to_x: "pv.normal.control.bg"; to_y: "pv.normal.control.toolbar.rect"; offset: +18 0;} - rel2 { relative: 0.05 0.45; to_x: "pv.normal.control.bg"; to_y: "pv.normal.control.toolbar.rect"; offset: +78 0;} + align: 0.0 0.0; + rel1 { relative: 1.0 0.0; to: "pv.normal.control.toolbar.rect"; } + rel2 { relative: 1.0 1.0; to: "pv.normal.control.toolbar.rect"; } color: 255 255 255 255; } PV_PART_DESCRIPTION_HIDE PV_PART_DESCRIPTION_SHOW } + part { name: "pv.normal.control.toolbar.popupPlayer"; type: SWALLOW; @@ -315,6 +323,23 @@ collections { PV_PART_DESCRIPTION_SHOW } + part { + name: "pv.normal.control.toolbar.play.control.padding"; + type: RECT; + mouse_events: 1; + scale: 1; + description { + state: "default" 0.0; + visible: 0; + min: 44 44; + max: 44 44; + fixed: 1 1; + align: 0.0 0.0; + rel1 { relative: 0.0 0.0; to: "pv.normal.control.bg";} + rel2 { relative: 0.0 0.0; to: "pv.normal.control.bg";} + color: 0 0 255 255; + } + } part { name: "pv.normal.control.play"; type: SWALLOW; @@ -323,11 +348,12 @@ collections { description { state: "default" 0.0; visible: 1; - min: 80 80; + min: 48 48; + max: 48 48; fixed: 1 1; align: 0.5 0.5; - rel1 { relative: 0.5 0.0; to_y: "pv.normal.control.toolbar.rect";} - rel2 { relative: 0.5 1.0; to_y: "pv.normal.control.toolbar.rect";} + rel1 { relative: 0.5 1.0; to_x: pv.normal.control.bg; to_y: "pv.normal.control.toolbar.play.control.padding"; offset: 0 24;} + rel2 { relative: 0.5 1.0; to_x: pv.normal.control.bg; to_y: "pv.normal.control.toolbar.play.control.padding"; offset: 0 24;} color: 255 255 255 255; } PV_PART_DESCRIPTION_HIDE @@ -358,11 +384,12 @@ collections { description { state: "default" 0.0; visible: 0; - min: 16 0; - fixed: 1 0; - align: 1.0 0.5; - rel1 { relative: 0.0 0.0; to_x: "pv.normal.control.play"; to_y: "pv.normal.control.toolbar.rect";} - rel2 { relative: 0.0 1.0; to_x: "pv.normal.control.play"; to_y: "pv.normal.control.toolbar.rect";} + min: 40 48; + max: 40 48; + fixed: 1 1; + align: 1.0 0.0; + rel1 { relative: 0.0 0.0; to : "pv.normal.control.play"; } + rel2 { relative: 0.0 1.0; to : "pv.normal.control.play"; } color: 255 255 0 255; } } @@ -375,12 +402,13 @@ collections { description { state: "default" 0.0; visible: 0; - min: 16 0; - fixed: 1 0; - align: 0.0 0.5; - rel1 { relative: 1.0 0.0; to_x: "pv.normal.control.play"; to_y: "pv.normal.control.toolbar.rect";} - rel2 { relative: 1.0 1.0; to_x: "pv.normal.control.play"; to_y: "pv.normal.control.toolbar.rect";} - color: 255 255 0 255; + min: 40 48; + max: 40 48; + fixed: 1 1; + align: 0.0 0.0; + rel1 { relative: 1.0 0.0; to : "pv.normal.control.play"; } + rel2 { relative: 1.0 1.0; to : "pv.normal.control.play"; } + color: 255 0 0 255; } } @@ -392,11 +420,12 @@ collections { description { state: "default" 0.0; visible: 1; - min: 110 110; + min: 48 48; + max: 48 48; fixed: 1 1; - align: 1.0 0.5; - rel1 { relative: 0.0 0.5; to_x: "pv.normal.control.play.left.padding"; to_y: "pv.normal.control.toolbar.rect";} - rel2 { relative: 0.0 0.5; to_x: "pv.normal.control.play.left.padding"; to_y: "pv.normal.control.toolbar.rect";} + align: 1.0 0.0; + rel1 { relative: 0.0 0.0; to_x: "pv.normal.control.play.left.padding"; to_y: "pv.normal.control.play";} + rel2 { relative: 0.0 1.0; to_x: "pv.normal.control.play.left.padding"; to_y: "pv.normal.control.play";} color: 255 255 255 255; } PV_PART_DESCRIPTION_HIDE @@ -411,11 +440,12 @@ collections { description { state: "default" 0.0; visible: 1; - min: 110 110; + min: 48 48; + max: 48 48; fixed: 1 1; - align: 0.0 0.5; - rel1 { relative: 1.0 0.5; to_x: "pv.normal.control.play.right.padding"; to_y: "pv.normal.control.toolbar.rect";} - rel2 { relative: 1.0 0.5; to_x: "pv.normal.control.play.right.padding"; to_y: "pv.normal.control.toolbar.rect";} + align: 0.0 0.0; + rel1 { relative: 1.0 0.0; to_x: "pv.normal.control.play.right.padding"; to_y: "pv.normal.control.play";} + rel2 { relative: 1.0 1.0; to_x: "pv.normal.control.play.right.padding"; to_y: "pv.normal.control.play";} color: 255 255 255 255; } PV_PART_DESCRIPTION_HIDE diff --git a/vp-main/res/edje/pv-normal-main.edc b/vp-main/res/edje/pv-normal-main.edc index 1c219c0..79267cc 100755 --- a/vp-main/res/edje/pv-normal-main.edc +++ b/vp-main/res/edje/pv-normal-main.edc @@ -15,6 +15,7 @@ */ #include "pv-image.edc" +#include "custom/pv-custom-define.edc" #define FONT_BOLD_TYPE "Tizen:style=Bold" #define FONT_COLOR 255 255 255 255 @@ -39,6 +40,7 @@ externals { } collections { + base_scale: CURRENT_BASE_SCALE; plugins { plugin { name: "touch_sound_plugin"; @@ -489,12 +491,12 @@ collections { description { state: "portrait.show" 0.0; inherit: "default" 0.0; - min: 0 110; + min: 0 120; } description { state: "landscape.show" 0.0; inherit: "default" 0.0; - min: 0 100; + min: 0 120; } } @@ -541,6 +543,25 @@ collections { } } + + part { + name: "pv.normal.main.control.volume.icon.rightpadding"; + type: RECT; + mouse_events: 0; + scale: 1; + description { + state: "default" 0.0; + visible: 0; + min: 80 78;//(12+70+26+11+12+(34/2)); + max: 80 78;//(12+70+26+11+12+(34/2)); + fixed: 1 1; + align: 1.0 0.0; + rel1 { relative: 0.0 0.0; to_y: "pv.normal.main.control";} + rel2 { relative: 1.0 0.0; to_y: "pv.normal.main.control";} + color: 255 255 0 125; + } + } + part { name: "pv.normal.main.volume.icon"; type: SWALLOW; @@ -548,12 +569,12 @@ collections { scale: 1; description { state: "default" 0.0; - min: 60 60; + min: 32 32; fixed: 1 1; - align: 0.0 1.0; + align: 1.0 0.0; visible: 0; - rel1 { relative: 1.0 -0.02; to_y : "pv.normal.main.control"; offset: -134 0;} - rel2 { relative: 1.0 -0.02; to_y : "pv.normal.main.control"; offset: -194 0;} + rel1 { relative: 0.0 1.0; to: "pv.normal.main.control.volume.icon.rightpadding"; } + rel2 { relative: 0.0 1.0; to: "pv.normal.main.control.volume.icon.rightpadding"; } } description { state: "portrait.show" 0.0; @@ -567,6 +588,7 @@ collections { } } + part { name: "pv.normal.main.speed.rect"; type: RECT; diff --git a/vp-main/res/edje/pv-progressbar.edc b/vp-main/res/edje/pv-progressbar.edc index e98fd54..89bc2fe 100755 --- a/vp-main/res/edje/pv-progressbar.edc +++ b/vp-main/res/edje/pv-progressbar.edc @@ -14,6 +14,7 @@ * limitations under the License. */ #include "pv-image.edc" +#include "custom/pv-custom-define.edc" #define FONT_BOLD_TYPE "Tizen:style=Bold" #define FONT_MEDIUM_TYPE "Tizen:style=Medium" @@ -27,16 +28,32 @@ */ #define PLAYER_PROGRESSBAR_H 4 -#define PLAYER_CIRCLE_W 26 -#define PLAYER_CIRCLE_H 26 -#define PLAYER_CIRCLE_PRESS_W 26 -#define PLAYER_CIRCLE_PRESS_H 26 +#define PLAYER_CIRCLE_W 24 +#define PLAYER_CIRCLE_H 24 +#define PLAYER_CIRCLE_PRESS_W 42 +#define PLAYER_CIRCLE_PRESS_H 42 #define IMG_PLAYER_PROGRESSBAR_BG "progressbar/core_progress_bar.#.png" #define IMG_PLAYER_PROGRESSBAR_HANDLE "progressbar/T01_2_control_progress_handle.png" #define IMG_PLAYER_PROGRESSBAR_HANDLE_PRESS "progressbar/T01_2_control_progress_handle_press.png" + +styles { + style { name: "progess_playing_text"; + base: "font=Tizen:weight=Regular:width=BreezeSans font_size=18 color=#001447"; + } +} + +styles { + style { name: "progess_duration_text"; + base: "font=Tizen:weight=Regular:width=BreezeSans font_size=18 align=right color=#001447"; + } +} + + + collections { + base_scale: CURRENT_BASE_SCALE; group { name: "pv.progress"; @@ -64,7 +81,7 @@ collections { description { state: "default" 0.0; visible: 0; - min: 12 0; + min: 80 0; fixed: 1 0; align: 0.0 0.0; rel1 { relative: 0.0 0.0; to_y : "pv.progress.bg";} @@ -75,7 +92,7 @@ collections { description { state: "landscape" 0.0; inherit: "default" 0.0; - min: 12 0; + min: 80 0; } } @@ -104,7 +121,7 @@ collections { description { state: "default" 0.0; visible: 0; - min: 12 0; + min: 80 0; fixed: 1 0; align: 1.0 0.0; rel1 { relative: 1.0 0.0; to_y : "pv.progress.bg";} @@ -115,7 +132,7 @@ collections { description { state: "landscape" 0.0; inherit: "default" 0.0; - min: 12 0; + min: 80 0; } } @@ -154,61 +171,58 @@ collections { part { name: "pv.progress.playing.txt"; - type: TEXT; + type: TEXTBLOCK; mouse_events: 1; scale: 1; - effect: FAR_SHADOW BOTTOM; description { state: "default" 0.0; visible: 1; - min: 90 16; + min: 120 22; fixed: 1 1; align: 0.0 1.0; - rel1 { relative: 1.0 1.0; offset: 0 -40; to_x : "pv.progress.playing.txt.left.padding"; to_y : "pv.progress.bottom.padding";} - rel2 { relative: 1.0 1.0; offset: 0 -40; to_x : "pv.progress.playing.txt.left.padding"; to_y : "pv.progress.bottom.padding";} - color: 5 131 198 255; + rel1 { relative: 0.0 1.0; to_x : "pv.progress.bg"; to_y : "pv.progress.bg";} + rel2 { relative: 0.0 1.0; to_x : "pv.progress.bg"; to_y : "pv.progress.bg";} + color: 0 8 28 255; text { - size: 12; text: "00:00:00"; align: 0.0 0.5; + style: progess_playing_text; } } description { state: "landscape" 0.0; inherit: "default" 0.0; - align: 0.0 0.5; - rel1 { relative: 1.0 0.5; offset: 0 40; to_x : "pv.progress.playing.txt.left.padding"; to_y : "pv.progress.bg";} - rel2 { relative: 1.0 0.5; offset: 0 40; to_x : "pv.progress.playing.txt.left.padding"; to_y : "pv.progress.bg";} + align: 0.0 1.0; + rel1 { relative: 0.0 1.0; to_x : "pv.progress.bg"; to_y : "pv.progress.bg";} + rel2 { relative: 0.0 1.0; to_x : "pv.progress.bg"; to_y : "pv.progress.bg";} } } part { name: "pv.progress.duration.txt"; - type: TEXT; + type: TEXTBLOCK; mouse_events: 1; scale: 1; - effect: FAR_SHADOW BOTTOM; description { state: "default" 0.0; visible: 1; - min: 90 16; + min: 120 22; fixed: 1 1; align: 1.0 1.0; - rel1 { relative: 0.0 1.0; offset: 0 -40; to_x : "pv.progress.duration.txt.right.padding"; to_y : "pv.progress.bottom.padding";} - rel2 { relative: 0.0 1.0; offset: 0 -40; to_x : "pv.progress.duration.txt.right.padding"; to_y : "pv.progress.bottom.padding";} - color: 179 179 179 255; + rel1 { relative: 1.0 1.0; to_x : "pv.progress.bg"; to_y : "pv.progress.bg";} + rel2 { relative: 1.0 1.0; to_x : "pv.progress.bg"; to_y : "pv.progress.bg";} + color: 0 8 28 255; text { - size: 12; text: "--:--:--"; - align: 1.0 0.5; + style: progess_duration_text; } } description { state: "landscape" 0.0; inherit: "default" 0.0; - align: 1.0 0.5; - rel1 { relative: 0.0 0.5; offset: 0 40; to_x : "pv.progress.duration.txt.right.padding"; to_y : "pv.progress.bg";} - rel2 { relative: 0.0 0.5; offset: 0 40; to_x : "pv.progress.duration.txt.right.padding"; to_y : "pv.progress.bg";} + align: 1.0 1.0; + rel1 { relative: 1.0 1.0; to_x : "pv.progress.bg"; to_y : "pv.progress.bg";} + rel2 { relative: 1.0 1.0; to_x : "pv.progress.bg"; to_y : "pv.progress.bg";} } } @@ -223,18 +237,18 @@ collections { min: 0 PLAYER_PROGRESSBAR_H; fixed: 0 1; align: 0.0 0.0; - rel1 { relative: 0.02 0.0; to_x : "pv.progress.playing.txt"; to_y : "pv.progress.bg";} - rel2 { relative: 0.98 0.0; to_x : "pv.progress.duration.txt"; to_y : "pv.progress.bg";} + rel1 { relative: 0.0 0.0; offset: 0 +10; to_x : "pv.progress.playing.txt"; to_y : "pv.progress.bg";} + rel2 { relative: 1.0 0.0; offset: 0 +10; to_x : "pv.progress.duration.txt"; to_y : "pv.progress.bg";} image { normal: IMG_PLAYER_PROGRESSBAR_BG;} - color: 179 179 179 255; + color: 255 255 255 255; } description { state: "landscape" 0.0; inherit: "default" 0.0; - align: 1.0 0.5; - rel1 { relative: 0.02 0.5; to_x : "pv.progress.playing.txt"; to_y : "pv.progress.bg";} - rel2 { relative: 0.98 0.5; to_x : "pv.progress.duration.txt"; to_y : "pv.progress.bg";} + align: 0.0 0.0; + rel1 { relative: 0.0 0.0; offset: 0 +10; to_x : "pv.progress.playing.txt"; to_y : "pv.progress.bg";} + rel2 { relative: 1.0 0.0; offset: 0 +10; to_x : "pv.progress.duration.txt"; to_y : "pv.progress.bg";} } } part { @@ -250,7 +264,7 @@ collections { rel1 { relative: 0.0 0.0; to: "pv.progress.bar.bg"; offset : -2 -1; } rel2 { relative: 0.5 1.0; to_x: "pv.progress.circle"; to_y: "pv.progress.bar.bg"; } image { normal: IMG_PLAYER_PROGRESSBAR_BG;} - color: 0 166 191 255; + color: 10 14 74 255; } description { @@ -391,7 +405,7 @@ collections { rel1 { relative: 0.5 0.5; to_x: "pv.progress.circle"; to_y: "pv.progress.bar.bg"; } rel2 { relative: 0.5 0.5; to_x: "pv.progress.circle"; to_y: "pv.progress.bar.bg"; } image { normal: IMG_PLAYER_PROGRESSBAR_HANDLE;} - color: 0 166 191 255; + color: 10 14 74 255; } } part { @@ -408,7 +422,7 @@ collections { rel1 { relative: 0.5 0.5; to_x: "pv.progress.circle"; to_y: "pv.progress.bar.bg"; } rel2 { relative: 0.5 0.5; to_x: "pv.progress.circle"; to_y: "pv.progress.bar.bg"; } image { normal: IMG_PLAYER_PROGRESSBAR_HANDLE_PRESS;} - color: 0 166 191 255; + color: 10 14 74 255; } description { state: "show" 0.0; -- 2.34.1