From: amitpatel Date: Fri, 3 Jul 2020 09:55:18 +0000 (+0530) Subject: Update Video Player main page controls X-Git-Tag: submit/tizen/20200708.104956~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F81%2F237781%2F4;p=profile%2Fiot%2Fapps%2Fnative%2Fvideo-player.git Update Video Player main page controls Change-Id: I24f51ab2af2001d310ac52af7dbd03d7a110dd08 Signed-off-by: amitpatel --- 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 baf1df0..3b3cc24 100755 Binary files a/playview/res/edje/images/button/core_icon_back.png and b/playview/res/edje/images/button/core_icon_back.png differ 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 0000000..9a5ff34 Binary files /dev/null and b/playview/res/edje/images/button/icon_more_menu.png differ 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 6042922..c64b85b 100755 Binary files a/playview/res/edje/images/control/T01-2_control_bg_h.png and b/playview/res/edje/images/control/T01-2_control_bg_h.png differ 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 a113871..9ce07bd 100755 Binary files a/playview/res/edje/images/control/T01-2_control_circle_icon_next.png and b/playview/res/edje/images/control/T01-2_control_circle_icon_next.png differ 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 6806d10..d7d02c2 100755 Binary files a/playview/res/edje/images/control/T01-2_control_circle_icon_pause.png and b/playview/res/edje/images/control/T01-2_control_circle_icon_pause.png differ 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 68570ac..5593cb7 100755 Binary files a/playview/res/edje/images/control/T01-2_control_circle_icon_play.png and b/playview/res/edje/images/control/T01-2_control_circle_icon_play.png differ diff --git a/playview/res/edje/images/control/T01-2_control_circle_icon_rewind.png b/playview/res/edje/images/control/T01-2_control_circle_icon_rewind.png index 155955e..a4a2e16 100755 Binary files a/playview/res/edje/images/control/T01-2_control_circle_icon_rewind.png and b/playview/res/edje/images/control/T01-2_control_circle_icon_rewind.png differ diff --git a/playview/res/edje/images/function/T01-2_control_icon_mute.png b/playview/res/edje/images/function/T01-2_control_icon_mute.png index 63533f4..cd047c8 100755 Binary files a/playview/res/edje/images/function/T01-2_control_icon_mute.png and b/playview/res/edje/images/function/T01-2_control_icon_mute.png differ diff --git a/playview/res/edje/images/function/T01-2_control_icon_mute_dim.png b/playview/res/edje/images/function/T01-2_control_icon_mute_dim.png index da5474c..cd047c8 100755 Binary files a/playview/res/edje/images/function/T01-2_control_icon_mute_dim.png and b/playview/res/edje/images/function/T01-2_control_icon_mute_dim.png differ diff --git a/playview/res/edje/images/function/T01-2_control_icon_mute_press.png b/playview/res/edje/images/function/T01-2_control_icon_mute_press.png index 95e82ee..cd047c8 100755 Binary files a/playview/res/edje/images/function/T01-2_control_icon_mute_press.png and b/playview/res/edje/images/function/T01-2_control_icon_mute_press.png differ 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 d56760c..fdc12f6 100755 Binary files a/playview/res/edje/images/function/T01_2_control_icon_screenmode02.png and b/playview/res/edje/images/function/T01_2_control_icon_screenmode02.png differ 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 d98a961..fdc12f6 100755 Binary files a/playview/res/edje/images/function/T01_2_control_icon_screenmode02_dim.png and b/playview/res/edje/images/function/T01_2_control_icon_screenmode02_dim.png differ 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 fee5177..fdc12f6 100755 Binary files a/playview/res/edje/images/function/T01_2_control_icon_screenmode02_press.png and b/playview/res/edje/images/function/T01_2_control_icon_screenmode02_press.png differ diff --git a/playview/res/edje/images/function/T01_2_control_icon_screenmode03.png b/playview/res/edje/images/function/T01_2_control_icon_screenmode03.png index fc8aade..c8b45bb 100755 Binary files a/playview/res/edje/images/function/T01_2_control_icon_screenmode03.png and b/playview/res/edje/images/function/T01_2_control_icon_screenmode03.png differ diff --git a/playview/res/edje/images/function/T01_2_control_icon_screenmode03_dim.png b/playview/res/edje/images/function/T01_2_control_icon_screenmode03_dim.png index f4e213d..c8b45bb 100755 Binary files a/playview/res/edje/images/function/T01_2_control_icon_screenmode03_dim.png and b/playview/res/edje/images/function/T01_2_control_icon_screenmode03_dim.png differ diff --git a/playview/res/edje/images/function/T01_2_control_icon_screenmode03_press.png b/playview/res/edje/images/function/T01_2_control_icon_screenmode03_press.png index 38a9e0d..c8b45bb 100755 Binary files a/playview/res/edje/images/function/T01_2_control_icon_screenmode03_press.png and b/playview/res/edje/images/function/T01_2_control_icon_screenmode03_press.png differ 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 e4424a2..107d42c 100755 Binary files a/playview/res/edje/images/function/T01_2_control_icon_volume.png and b/playview/res/edje/images/function/T01_2_control_icon_volume.png differ 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 8d525b8..107d42c 100755 Binary files a/playview/res/edje/images/function/T01_2_control_icon_volume_dim.png and b/playview/res/edje/images/function/T01_2_control_icon_volume_dim.png differ diff --git a/playview/res/edje/images/function/T01_2_control_icon_volume_press.png b/playview/res/edje/images/function/T01_2_control_icon_volume_press.png index 26ffc61..107d42c 100755 Binary files a/playview/res/edje/images/function/T01_2_control_icon_volume_press.png and b/playview/res/edje/images/function/T01_2_control_icon_volume_press.png differ 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 0000000..afd795d Binary files /dev/null and b/playview/res/edje/images/navigation_bg/00_top_bar_empty.png differ 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 c4e7a4f..34baf91 100755 Binary files a/playview/res/edje/images/progressbar/T01_2_control_progress_handle.png and b/playview/res/edje/images/progressbar/T01_2_control_progress_handle.png differ diff --git a/playview/res/edje/images/progressbar/T01_2_control_progress_handle_press.png b/playview/res/edje/images/progressbar/T01_2_control_progress_handle_press.png index b1977db..54b8169 100755 Binary files a/playview/res/edje/images/progressbar/T01_2_control_progress_handle_press.png and b/playview/res/edje/images/progressbar/T01_2_control_progress_handle_press.png differ 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 baf1df0..3b3cc24 100755 Binary files a/vp-main/res/edje/images/button/core_icon_back.png and b/vp-main/res/edje/images/button/core_icon_back.png differ 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 0000000..9a5ff34 Binary files /dev/null and b/vp-main/res/edje/images/button/icon_more_menu.png differ 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 6042922..c64b85b 100755 Binary files a/vp-main/res/edje/images/control/T01-2_control_bg_h.png and b/vp-main/res/edje/images/control/T01-2_control_bg_h.png differ 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 a113871..9ce07bd 100755 Binary files a/vp-main/res/edje/images/control/T01-2_control_circle_icon_next.png and b/vp-main/res/edje/images/control/T01-2_control_circle_icon_next.png differ 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 6806d10..d7d02c2 100755 Binary files a/vp-main/res/edje/images/control/T01-2_control_circle_icon_pause.png and b/vp-main/res/edje/images/control/T01-2_control_circle_icon_pause.png differ 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 68570ac..5593cb7 100755 Binary files a/vp-main/res/edje/images/control/T01-2_control_circle_icon_play.png and b/vp-main/res/edje/images/control/T01-2_control_circle_icon_play.png differ diff --git a/vp-main/res/edje/images/control/T01-2_control_circle_icon_rewind.png b/vp-main/res/edje/images/control/T01-2_control_circle_icon_rewind.png index 155955e..a4a2e16 100755 Binary files a/vp-main/res/edje/images/control/T01-2_control_circle_icon_rewind.png and b/vp-main/res/edje/images/control/T01-2_control_circle_icon_rewind.png differ diff --git a/vp-main/res/edje/images/function/T01-2_control_icon_mute.png b/vp-main/res/edje/images/function/T01-2_control_icon_mute.png index 63533f4..cd047c8 100755 Binary files a/vp-main/res/edje/images/function/T01-2_control_icon_mute.png and b/vp-main/res/edje/images/function/T01-2_control_icon_mute.png differ diff --git a/vp-main/res/edje/images/function/T01-2_control_icon_mute_dim.png b/vp-main/res/edje/images/function/T01-2_control_icon_mute_dim.png index da5474c..cd047c8 100755 Binary files a/vp-main/res/edje/images/function/T01-2_control_icon_mute_dim.png and b/vp-main/res/edje/images/function/T01-2_control_icon_mute_dim.png differ diff --git a/vp-main/res/edje/images/function/T01-2_control_icon_mute_press.png b/vp-main/res/edje/images/function/T01-2_control_icon_mute_press.png index 95e82ee..cd047c8 100755 Binary files a/vp-main/res/edje/images/function/T01-2_control_icon_mute_press.png and b/vp-main/res/edje/images/function/T01-2_control_icon_mute_press.png differ 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 d56760c..fdc12f6 100755 Binary files a/vp-main/res/edje/images/function/T01_2_control_icon_screenmode02.png and b/vp-main/res/edje/images/function/T01_2_control_icon_screenmode02.png differ 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 d98a961..fdc12f6 100755 Binary files a/vp-main/res/edje/images/function/T01_2_control_icon_screenmode02_dim.png and b/vp-main/res/edje/images/function/T01_2_control_icon_screenmode02_dim.png differ 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 fee5177..fdc12f6 100755 Binary files a/vp-main/res/edje/images/function/T01_2_control_icon_screenmode02_press.png and b/vp-main/res/edje/images/function/T01_2_control_icon_screenmode02_press.png differ diff --git a/vp-main/res/edje/images/function/T01_2_control_icon_screenmode03.png b/vp-main/res/edje/images/function/T01_2_control_icon_screenmode03.png index fc8aade..c8b45bb 100755 Binary files a/vp-main/res/edje/images/function/T01_2_control_icon_screenmode03.png and b/vp-main/res/edje/images/function/T01_2_control_icon_screenmode03.png differ diff --git a/vp-main/res/edje/images/function/T01_2_control_icon_screenmode03_dim.png b/vp-main/res/edje/images/function/T01_2_control_icon_screenmode03_dim.png index f4e213d..c8b45bb 100755 Binary files a/vp-main/res/edje/images/function/T01_2_control_icon_screenmode03_dim.png and b/vp-main/res/edje/images/function/T01_2_control_icon_screenmode03_dim.png differ diff --git a/vp-main/res/edje/images/function/T01_2_control_icon_screenmode03_press.png b/vp-main/res/edje/images/function/T01_2_control_icon_screenmode03_press.png index 38a9e0d..c8b45bb 100755 Binary files a/vp-main/res/edje/images/function/T01_2_control_icon_screenmode03_press.png and b/vp-main/res/edje/images/function/T01_2_control_icon_screenmode03_press.png differ 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 e4424a2..107d42c 100755 Binary files a/vp-main/res/edje/images/function/T01_2_control_icon_volume.png and b/vp-main/res/edje/images/function/T01_2_control_icon_volume.png differ 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 8d525b8..107d42c 100755 Binary files a/vp-main/res/edje/images/function/T01_2_control_icon_volume_dim.png and b/vp-main/res/edje/images/function/T01_2_control_icon_volume_dim.png differ diff --git a/vp-main/res/edje/images/function/T01_2_control_icon_volume_press.png b/vp-main/res/edje/images/function/T01_2_control_icon_volume_press.png index 26ffc61..107d42c 100755 Binary files a/vp-main/res/edje/images/function/T01_2_control_icon_volume_press.png and b/vp-main/res/edje/images/function/T01_2_control_icon_volume_press.png differ 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 0000000..afd795d Binary files /dev/null and b/vp-main/res/edje/images/navigation_bg/00_top_bar_empty.png differ 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 c4e7a4f..34baf91 100755 Binary files a/vp-main/res/edje/images/progressbar/T01_2_control_progress_handle.png and b/vp-main/res/edje/images/progressbar/T01_2_control_progress_handle.png differ diff --git a/vp-main/res/edje/images/progressbar/T01_2_control_progress_handle_press.png b/vp-main/res/edje/images/progressbar/T01_2_control_progress_handle_press.png index b1977db..54b8169 100755 Binary files a/vp-main/res/edje/images/progressbar/T01_2_control_progress_handle_press.png and b/vp-main/res/edje/images/progressbar/T01_2_control_progress_handle_press.png differ 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;