From: amitpatel Date: Fri, 17 Jul 2020 05:07:26 +0000 (+0530) Subject: Volume and Brightness Control progress bar X-Git-Tag: submit/tizen/20200718.073205^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=12c76619f8ef12e0e9b5569ee228e41cc2425d68;p=profile%2Fiot%2Fapps%2Fnative%2Fvideo-player.git Volume and Brightness Control progress bar Change-Id: I1cafadee3eadb911269884d17bbee41ae2dd3de9 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 bf6fb9c..86f2427 100755 --- a/playview/res/edje/custom/pv-custom-button.edc +++ b/playview/res/edje/custom/pv-custom-button.edc @@ -167,7 +167,7 @@ group { rel1.relative: 0.0 0.0; rel2.relative: 1.0 1.0; visible: 0; - color: 255 0 0 100; + color: 255 0 0 100; } description { state: "clicked" 0.0; @@ -356,6 +356,7 @@ group { inherit: "default" 0.0; } } + part { name: "elm.text"; type: TEXT; @@ -511,8 +512,8 @@ group { state: "default" 0.0; rel1.relative: 0.0 0.0; rel2.relative: 1.0 1.0; - max: 21 24; - min: 21 24; + max: 21 24; + min: 21 24; visible: 1; image { normal: "control/T01-2_control_circle_icon_rewind.png";} } @@ -529,20 +530,8 @@ group { inherit: "default" 0.0; } } - part { - name: "button_imageAMIT"; - type: IMAGE; - 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; - color: 255 0 0 100; - visible: 1; - } - } + + part { name: "elm.text"; type: TEXT; @@ -2500,7 +2489,7 @@ group { min: 28 25; max: 28 25; align: 0.5 0.5; - rel1 + rel1 {relative: 0.0 0.0; to:"button_image"; } rel2 {relative: 1.0 1.0; to:"button_image"; } @@ -2778,6 +2767,7 @@ group { visible: 1; } } + part { name: "elm.text"; type: TEXT; diff --git a/playview/res/edje/images/brightness/quick_icon_brightness.png b/playview/res/edje/images/brightness/quick_icon_brightness.png new file mode 100755 index 0000000..c4f6af8 Binary files /dev/null and b/playview/res/edje/images/brightness/quick_icon_brightness.png differ diff --git a/playview/res/edje/images/popup/T01-2_volume_popup_icon_volume01.png b/playview/res/edje/images/popup/T01-2_volume_popup_icon_volume01.png index fd96325..f98d442 100755 Binary files a/playview/res/edje/images/popup/T01-2_volume_popup_icon_volume01.png and b/playview/res/edje/images/popup/T01-2_volume_popup_icon_volume01.png differ diff --git a/playview/res/edje/images/popup/T01-2_volume_popup_icon_volume02.png b/playview/res/edje/images/popup/T01-2_volume_popup_icon_volume02.png index ee5340f..cd047c8 100755 Binary files a/playview/res/edje/images/popup/T01-2_volume_popup_icon_volume02.png and b/playview/res/edje/images/popup/T01-2_volume_popup_icon_volume02.png differ diff --git a/playview/res/edje/images/volume/T01_2_volume_popup_bg.png b/playview/res/edje/images/volume/T01_2_volume_popup_bg.png index 2069958..262a0e9 100755 Binary files a/playview/res/edje/images/volume/T01_2_volume_popup_bg.png and b/playview/res/edje/images/volume/T01_2_volume_popup_bg.png differ diff --git a/playview/res/edje/images/volume/T01_2_volume_popup_progress_bar.png b/playview/res/edje/images/volume/T01_2_volume_popup_progress_bar.png index 509ecbb..ebdc86a 100755 Binary files a/playview/res/edje/images/volume/T01_2_volume_popup_progress_bar.png and b/playview/res/edje/images/volume/T01_2_volume_popup_progress_bar.png differ diff --git a/playview/res/edje/images/volume/T01_2_volume_popup_progress_bg.png b/playview/res/edje/images/volume/T01_2_volume_popup_progress_bg.png index f789938..090da8a 100755 Binary files a/playview/res/edje/images/volume/T01_2_volume_popup_progress_bg.png and b/playview/res/edje/images/volume/T01_2_volume_popup_progress_bg.png differ diff --git a/playview/res/edje/images/volume/T01_2_volume_popup_progress_handle.png b/playview/res/edje/images/volume/T01_2_volume_popup_progress_handle.png index 68105d1..34baf91 100755 Binary files a/playview/res/edje/images/volume/T01_2_volume_popup_progress_handle.png and b/playview/res/edje/images/volume/T01_2_volume_popup_progress_handle.png differ diff --git a/playview/res/edje/images/volume/T01_2_volume_popup_progress_handle_press.png b/playview/res/edje/images/volume/T01_2_volume_popup_progress_handle_press.png index 88eb56f..54b8169 100755 Binary files a/playview/res/edje/images/volume/T01_2_volume_popup_progress_handle_press.png and b/playview/res/edje/images/volume/T01_2_volume_popup_progress_handle_press.png differ diff --git a/playview/res/edje/pv-brightness-popup.edc b/playview/res/edje/pv-brightness-popup.edc index 0e0be15..cf468c1 100755 --- a/playview/res/edje/pv-brightness-popup.edc +++ b/playview/res/edje/pv-brightness-popup.edc @@ -14,14 +14,16 @@ * limitations under the License. */ #include "pv-image.edc" +#include "custom/pv-custom-define.edc" #define FONT_BOLD_TYPE "Tizen:style=Bold" - #define FONT_VOLUME_COLOR 255 255 255 255 +#define BRIGHTNESS_WIDGET_WIDTH 82 +#define BRIGHTNESS_LANDSCAPE_HEIGHT 482 collections { - base_scale : 1.6; + base_scale : CURRENT_BASE_SCALE; group { name: "pv.brightness.popup"; parts { @@ -34,7 +36,7 @@ collections { description { state: "default" 0.0; visible : 1; - min: 58 286; + min: BRIGHTNESS_WIDGET_WIDTH BRIGHTNESS_LANDSCAPE_HEIGHT; fixed: 1 1; align: 0.0 0.0; rel1 { relative: 0.0 0.0;} @@ -51,109 +53,81 @@ collections { description { state: "default" 0.0; visible : 1; - min: 58 286; + min: BRIGHTNESS_WIDGET_WIDTH BRIGHTNESS_LANDSCAPE_HEIGHT; fixed: 1 1; align: 0.0 0.0; rel1 { relative: 0.0 0.0;} - rel2 { relative: 0.0 0.5;} + rel2 { relative: 0.0 0.0;} color: 255 255 255 255; - image { normal: "volume/T01_2_volume_popup_bg.png"; border: 0 0 29 29;} + image { normal: "volume/T01_2_volume_popup_bg.png";} } } part { - name: "pv.brightness.popup.icon.padding"; + name: "pv.brightness.popup.top.padding"; type: RECT; mouse_events: 0; scale: 1; description { state: "default" 0.0; visible : 0; - min: 0 12; + min: 0 44; fixed: 1 1; align: 0.0 0.0; rel1 { relative: 0.0 0.0; to: "pv.brightness.popup.bg";} rel2 { relative: 1.0 0.0; to: "pv.brightness.popup.bg";} color: 255 0 0 255; - } } part { - name: "pv.brightness.popup.icon"; - type: SWALLOW; - mouse_events: 0; - scale: 1; - description { - state: "default" 0.0; - visible : 1; - min: 22 22; - fixed: 1 1; - align: 0.5 0.0; - rel1 { relative: 0.5 1.0; to_x: "pv.brightness.popup.bg"; to_y: "pv.brightness.popup.icon.padding";} - rel2 { relative: 0.5 1.0; to_x: "pv.brightness.popup.bg"; to_y: "pv.brightness.popup.icon.padding";} - } - } - - part { - name: "pv.brightness.popup.top.padding"; + name: "pv.brightness.popup.bottom.padding"; type: RECT; mouse_events: 0; scale: 1; description { state: "default" 0.0; visible : 0; - min: 0 11; + min: 0 32; fixed: 1 1; - align: 0.0 0.0; - rel1 { relative: 0.0 1.0; to: "pv.brightness.popup.icon";} - rel2 { relative: 1.0 1.0; to: "pv.brightness.popup.icon";} + align: 0.0 1.0; + rel1 { relative: 0.0 1.0; to: "pv.brightness.popup.bg";} + rel2 { relative: 1.0 1.0; to: "pv.brightness.popup.bg";} color: 255 0 0 255; - } } part { - name: "pv.brightness.popup.bottom.padding"; + name: "pv.brightness.popup.icon.rect"; type: RECT; mouse_events: 0; scale: 1; description { state: "default" 0.0; visible : 0; - min: 0 18; + min: 32 32; + max: 32 32; fixed: 1 1; - align: 0.0 1.0; - rel1 { relative: 0.0 1.0; to: "pv.brightness.popup.bg";} - rel2 { relative: 1.0 1.0; to: "pv.brightness.popup.bg";} - color: 255 0 0 255; - + align: 0.5 1.0; + rel1 { relative: 0.5 0.0; to_x: "pv.brightness.popup.bg"; to_y: "pv.brightness.popup.bottom.padding";} + rel2 { relative: 0.5 0.0; to_x: "pv.brightness.popup.bg"; to_y: "pv.brightness.popup.bottom.padding";} } } part { - name: "pv.brightness.popup.txt"; - type: TEXT; + name: "pv.brightness.popup.icon"; + type: SWALLOW; mouse_events: 0; scale: 1; - effect: FAR_SHADOW BOTTOM; description { state: "default" 0.0; visible : 1; - min: 0 23; + min: 30 30; + max: 30 30; fixed: 1 1; - align: 0.5 1.0; - rel1 { relative: 0.0 0.0; to: "pv.brightness.popup.bottom.padding";} - rel2 { relative: 1.0 0.0; to: "pv.brightness.popup.bottom.padding";} - color: FONT_VOLUME_COLOR; - color3: 51 57 72 255; - text { - font: FONT_BOLD_TYPE; - size: 21; - text: "3"; - align: 0.5 0.5; - } - + align: 0.5 0.5; + rel1 { relative: 0.0 0.0; to: pv.brightness.popup.icon.rect;} + rel2 { relative: 1.0 1.0; to: pv.brightness.popup.icon.rect;} } } @@ -165,13 +139,11 @@ collections { description { state: "default" 0.0; visible : 0; - min: 0 11; - fixed: 0 1; + min: 0 12; + fixed: 1 1; align: 0.0 1.0; - rel1 { relative: 0.0 0.0; to: "pv.brightness.popup.txt";} - rel2 { relative: 1.0 0.0; to: "pv.brightness.popup.txt";} - color: 255 0 0 255; - + rel1 { relative: 0.0 0.0; to: "pv.brightness.popup.icon";} + rel2 { relative: 1.0 0.0; to: "pv.brightness.popup.icon";} } } @@ -183,12 +155,12 @@ collections { description { state: "default" 0.0; visible: 1; - min: 6 0; + min: 4 0; fixed: 1 0; align: 0.5 0.5; rel1 { relative: 0.5 1.0; to_x : "pv.brightness.popup.bg"; to_y : "pv.brightness.popup.top.padding";} rel2 { relative: 0.5 0.0; to_x : "pv.brightness.popup.bg"; to_y : "pv.brightness.popup.txt.padding";} - image { normal: "volume/T01_2_volume_popup_progress_bg.png"; border: 0 0 19 19;} + image { normal: "volume/T01_2_volume_popup_progress_bg.png";} color: 255 255 255 255; } } @@ -201,7 +173,7 @@ collections { description { state: "default" 0.0; visible: 0; - min: 0 22; + min: 0 24; fixed: 0 1; align: 0.5 0.0; rel1 { relative: 0.0 0.0; to : "pv.brightness.popup.bar.bg"; } @@ -218,7 +190,7 @@ collections { description { state: "default" 0.0; visible: 0; - min: 0 22; + min: 0 24; fixed: 0 1; align: 0.5 1.0; rel1 { relative: 0.0 1.0; to : "pv.brightness.popup.bar.bg"; } @@ -244,7 +216,6 @@ collections { } } - part { name: "pv.brightness.popup.step"; type: IMAGE; @@ -253,16 +224,16 @@ collections { description { state: "default" 0.0; visible: 1; - min: 6 0; + min: 4 0; fixed: 1 0; align: 0.0 0.0; rel1 { relative: 0.0 0.5; to_x : "pv.brightness.popup.bar.bg"; to_y: "pv.brightness.popup.circle"; } - rel2 { relative: 1.0 1.0; to_x : "pv.brightness.popup.bar.bg"; to_y: "pv.brightness.popup.bar.bg"; offset: 0 2; } - color: 255 255 255 255; - image { normal: "volume/T01_2_volume_popup_progress_bar.png"; border: 0 0 10 10;} + rel2 { relative: 1.0 1.0; to : "pv.brightness.popup.bar.bg"; } + image { normal: "volume/T01_2_volume_popup_progress_bar.png";} color: 255 255 255 255; } } + part { name: "pv.brightness.popup.confine.rect"; type: RECT; @@ -272,9 +243,9 @@ collections { state: "default" 0.0; visible: 1; align: 0.5 0.0; - min: 24 0; - rel1 { relative: 0.5 0.0; to: "pv.brightness.popup.bar.bg"; offset: 0 -11; } - rel2 { relative: 0.5 1.0; to: "pv.brightness.popup.bar.bg"; offset: 0 11; } + min: 32 0; + rel1 { relative: 0.5 0.0; to: "pv.brightness.popup.bar.bg"; offset: 0 -4;} + rel2 { relative: 0.5 1.0; to: "pv.brightness.popup.bar.bg"; offset: 0 +4;} color: 255 255 255 0; } } @@ -290,11 +261,12 @@ collections { min: 24 24; fixed: 1 1; align: 0.5 0.5; - rel1 { relative: 0.5 0.5; to_x: "pv.brightness.popup.bar.rect"; to_y: "pv.brightness.popup.playing"; } - rel2 { relative: 0.5 0.5; to_x: "pv.brightness.popup.bar.rect"; to_y: "pv.brightness.popup.playing"; } + rel1 { relative: 0.5 0.5; to_x: "pv.brightness.popup.bar.bg"; to_y: "pv.brightness.popup.playing"; } + rel2 { relative: 0.5 0.5; to_x: "pv.brightness.popup.bar.bg"; to_y: "pv.brightness.popup.playing"; } color: 255 255 255 255; } } + part { name: "pv.brightness.popup.playing"; type: RECT; @@ -303,8 +275,8 @@ collections { description { state: "default" 0.0; visible: 0; - min: 24 24; - fixed: 0 0; + min: 32 32; + fixed: 1 1; align: 0.0 0.0; } dragable { @@ -314,7 +286,6 @@ collections { } } - part { name: "pv.brightness.popup.point"; type: IMAGE; @@ -329,9 +300,35 @@ collections { rel1 { relative: 0.5 0.5; to: "pv.brightness.popup.playing"; } rel2 { relative: 0.5 0.5; to: "pv.brightness.popup.playing"; } image { normal: "volume/T01_2_volume_popup_progress_handle.png";} - color: 255 255 255 255; + color: 10 14 74 255; + } + description { + state: "select" 0.0; + inherit: "default" 0.0; + min: 32 32; + max: 32 32; + image { normal: "volume/T01_2_volume_popup_progress_handle_press.png";} + color: 10 14 74 255; } } + + programs { + program { + name: "brightness_select"; + source: "brightness.popup.point"; + signal: "brightness,select"; + action: STATE_SET "select" 0.0; + target: "pv.brightness.popup.point"; + } + program { + name: "brightness_unselect"; + source: "brightness.popup.point"; + signal: "brightness,unselect"; + action: STATE_SET "default" 0.0; + target: "pv.brightness.popup.point"; + } + + } /* programs */ } /* parts */ } /* group */ } /* collections */ diff --git a/playview/res/edje/pv-volume-popup.edc b/playview/res/edje/pv-volume-popup.edc index 3935957..1336f36 100755 --- a/playview/res/edje/pv-volume-popup.edc +++ b/playview/res/edje/pv-volume-popup.edc @@ -14,171 +14,165 @@ * limitations under the License. */ #include "pv-image.edc" +#include "custom/pv-custom-define.edc" -#define FONT_BOLD_TYPE "Tizen:style=Bold" +#define FONT_BOLD_TYPE "Tizen:style=Bold" -#define FONT_VOLUME_COLOR 255 255 255 255 -#define VOLUME_POPUP_BUTTON_HEIGHT 24 -#define VOLUME_POPUP_BUTTON_WIDTH 24 +#define FONT_VOLUME_COLOR 255 255 255 255 + +#define VOLUME_WIDGET_WIDTH 82 +#define VOLUME_WIDGET_PORTRAIT_HEIGHT 482 +#define VOLUME_WIDGET_LANDSCAPE_HEIGHT 482 + +#define VOLUME_BUTTON_HEIGHT 32 +#define VOLUME_BUTTON_WIDTH 32 +#define VOLUME_CIRCLE_H 24 +#define VOLUME_CIRCLE_W 24 +#define VOLUME_CIRCLE_PRESS_H 32 +#define VOLUME_CIRCLE_PRESS_W 32 +#define VOLUME_PROGRESS_WIDTH 4 collections { - base_scale : 1.6; + base_scale : CURRENT_BASE_SCALE; group { name: "pv.volume.popup"; parts { part { - name: "pv.volume.popup.rect"; - type: RECT; - mouse_events: 1; + name: "pv.volume.popup.bg"; + type: IMAGE; + mouse_events: 0; repeat_events: 0; scale: 1; description { state: "default" 0.0; visible : 1; - min: 58 286; + min: VOLUME_WIDGET_WIDTH VOLUME_WIDGET_LANDSCAPE_HEIGHT; + max: VOLUME_WIDGET_WIDTH VOLUME_WIDGET_LANDSCAPE_HEIGHT; fixed: 1 1; align: 0.0 0.0; - rel1 { relative: 0.5 0.5;} - rel2 { relative: 0.5 0.5;} - color: 0 0 0 0; + rel1 { relative: 0.0 0.0;} + rel2 { relative: 0.0 0.0;} + image { normal: "volume/T01_2_volume_popup_bg.png"; } } - } - part { - name: "pv.volume.popup.bg"; - type: IMAGE; - mouse_events: 0; - scale: 1; description { - state: "default" 0.0; - visible : 1; - min: 58 286; - fixed: 1 1; - align: 0.0 0.0; - rel1 { relative: 0.5 0.5;} - rel2 { relative: 0.5 0.5;} - color: 255 255 255 255; - image { normal: "volume/T01_2_volume_popup_bg.png"; border: 0 0 15 15;} + state: "landscape" 0.0; + inherit: "default" 0.0; + min: VOLUME_WIDGET_WIDTH VOLUME_WIDGET_LANDSCAPE_HEIGHT; + max: VOLUME_WIDGET_WIDTH VOLUME_WIDGET_LANDSCAPE_HEIGHT; + image { normal: "volume/T01_2_volume_popup_bg.png"; } } } part { - name: "pv.volume.popup.icon.padding"; - type: RECT; - mouse_events: 0; + name: "pv.volume.popup.top.padding"; + type: SPACER; scale: 1; description { state: "default" 0.0; - visible : 0; - min: 0 12; + min: 0 44; fixed: 1 1; align: 0.0 0.0; rel1 { relative: 0.0 0.0; to: "pv.volume.popup.bg";} rel2 { relative: 1.0 0.0; to: "pv.volume.popup.bg";} - color: 255 0 0 255; - + } + description { + state: "landscape" 0.0; + inherit: "default" 0.0; + min: 0 44; } } + part { - name: "pv.volume.popup.icon"; - type: IMAGE; - mouse_events: 0; + name: "pv.volume.popup.bottom.padding"; + type: SPACER; scale: 1; description { state: "default" 0.0; - visible : 1; - min: 22 22; + min: 0 32; fixed: 1 1; - align: 0.5 0.0; - rel1 { relative: 0.5 1.0; to_x: "pv.volume.popup.bg"; to_y: "pv.volume.popup.icon.padding";} - rel2 { relative: 0.5 1.0; to_x: "pv.volume.popup.bg"; to_y: "pv.volume.popup.icon.padding";} - color: 255 255 255 255; - image { normal: "popup/T01-2_volume_popup_icon_volume01.png"; } + align: 0.0 1.0; + rel1 { relative: 0.0 1.0; to: "pv.volume.popup.bg";} + rel2 { relative: 1.0 1.0; to: "pv.volume.popup.bg";} } description { - state: "mute" 0.0; + state: "landscape" 0.0; inherit: "default" 0.0; - image { normal: "popup/T01-2_volume_popup_icon_volume02.png"; } + min: 0 32; } } part { - name: "pv.volume.popup.top.padding"; + name: "pv.volume.popup.rect"; type: RECT; mouse_events: 0; scale: 1; description { state: "default" 0.0; visible : 0; - min: 0 11; + min: 32 32; + max: 32 32; fixed: 1 1; - align: 0.0 0.0; - rel1 { relative: 0.0 1.0; to: "pv.volume.popup.icon";} - rel2 { relative: 1.0 1.0; to: "pv.volume.popup.icon";} - color: 255 0 0 255; - + align: 0.5 1.0; + rel1 { relative: 0.5 0.0; to_x: "pv.volume.popup.bg"; to_y: "pv.volume.popup.bottom.padding";} + rel2 { relative: 0.5 0.0; to_x: "pv.volume.popup.bg"; to_y: "pv.volume.popup.bottom.padding";} } } - + part { - name: "pv.volume.popup.bottom.padding"; - type: RECT; + name: "pv.volume.popup.icon"; + type: IMAGE; mouse_events: 0; scale: 1; description { state: "default" 0.0; - visible : 0; - min: 0 18; - fixed: 1 1; - align: 0.0 1.0; - rel1 { relative: 0.0 1.0; to: "pv.volume.popup.bg";} - rel2 { relative: 1.0 1.0; to: "pv.volume.popup.bg";} - color: 255 0 0 255; - + visible : 1; + min: 27 24; + max: 27 24; + align: 0.5 0.5; + rel1 { relative: 0.0 0.0; to: pv.volume.popup.rect;} + rel2 { relative: 1.0 1.0; to: pv.volume.popup.rect;} + image { normal: "popup/T01-2_volume_popup_icon_volume01.png"; } + } + description { + state: "mute" 0.0; + inherit: "default" 0.0; + image { normal: "popup/T01-2_volume_popup_icon_volume02.png"; } } } + part { - name: "pv.volume.popup.txt"; - type: TEXT; + name: "pv.volume.popup.txt.padding"; + type: RECT; mouse_events: 0; scale: 1; - effect: FAR_SHADOW BOTTOM; description { state: "default" 0.0; - visible : 1; - min: 0 23; + visible : 0; + min: 0 12; fixed: 1 1; - align: 0.5 1.0; - rel1 { relative: 0.0 0.0; to: "pv.volume.popup.bottom.padding";} - rel2 { relative: 1.0 0.0; to: "pv.volume.popup.bottom.padding";} - color: FONT_VOLUME_COLOR; - color3: 51 57 72 255; - text { - font: FONT_BOLD_TYPE; - size: 21; - text: "3"; - align: 0.5 0.5; - } - + align: 0.0 1.0; + rel1 { relative: 0.0 0.0; to: "pv.volume.popup.icon";} + rel2 { relative: 1.0 0.0; to: "pv.volume.popup.icon";} + } + description { + state: "landscape" 0.0; + inherit: "default" 0.0; + min: 0 12; } } part { - name: "pv.volume.popup.txt.padding"; + name: "pv.volume.popup.touch.area"; type: RECT; - mouse_events: 0; scale: 1; + mouse_events: 1; description { state: "default" 0.0; - visible : 0; - min: 0 11; - fixed: 0 1; - align: 0.0 1.0; - rel1 { relative: 0.0 0.0; to: "pv.volume.popup.txt";} - rel2 { relative: 1.0 0.0; to: "pv.volume.popup.txt";} - color: 255 0 0 255; - + rel1 { relative: 0.0 0.0; to: "pv.volume.popup.bar.bg"; offset: -10 0; } + rel2 { relative: 1.0 1.0; to: "pv.volume.popup.bar.bg"; offset: 10 0; } + color: 0 0 0 0; } } @@ -190,13 +184,12 @@ collections { description { state: "default" 0.0; visible: 1; - min: 6 0; + min: VOLUME_PROGRESS_WIDTH 0; fixed: 1 0; align: 0.5 0.0; rel1 { relative: 0.5 1.0; to_x : "pv.volume.popup.bg"; to_y : "pv.volume.popup.top.padding";} rel2 { relative: 0.5 0.0; to_x : "pv.volume.popup.bg"; to_y : "pv.volume.popup.txt.padding";} - image { normal: "volume/T01_2_volume_popup_progress_bg.png"; border: 0 0 10 10;} - color: 255 255 255 255; + image { normal: "volume/T01_2_volume_popup_progress_bg.png"; } } } @@ -208,13 +201,12 @@ collections { description { state: "default" 0.0; visible: 1; - min: 6 0; + min: VOLUME_PROGRESS_WIDTH 0; fixed: 1 0; align: 0.0 0.0; - rel1 { relative: 0.0 0.5; to_x : "pv.volume.popup.bar.bg"; to_y: "pv.volume.popup.point";} - rel2 { relative: 1.0 1.0; to : "pv.volume.popup.bar.bg";offset: 0 2;} - color: 255 255 255 255; - image { normal: "volume/T01_2_volume_popup_progress_bar.png"; border: 0 0 10 10;} + rel1 { relative: 0.0 0.5; to_x : "pv.volume.popup.bar.bg"; to_y: "pv.volume.popup.point"; } + rel2 { relative: 1.0 1.0; to : "pv.volume.popup.bar.bg";} + image { normal: "volume/T01_2_volume_popup_progress_bar.png";} } } @@ -223,9 +215,9 @@ collections { scale: 1; mouse_events: 0; description{ state: "default" 0.0; - rel1 { relative: 0.5 0.0; to: "pv.volume.popup.bar.bg";offset: 0 -11; } - rel2 { relative: 0.5 1.0; to: "pv.volume.popup.bar.bg";offset: 0 11;} - min: VOLUME_POPUP_BUTTON_WIDTH 0; + rel1 { relative: 0.5 0.0; to: "pv.volume.popup.bar.bg"; offset: 0 -4;} + rel2 { relative: 0.5 1.0; to: "pv.volume.popup.bar.bg"; offset: 0 +4;} + min: VOLUME_BUTTON_WIDTH 0; fixed: 1 0; align: 0.5 0.0; visible: 0; @@ -238,11 +230,11 @@ collections { repeat_events: 0; description { state: "default" 0.0; - min: VOLUME_POPUP_BUTTON_WIDTH VOLUME_POPUP_BUTTON_HEIGHT; - max: VOLUME_POPUP_BUTTON_WIDTH VOLUME_POPUP_BUTTON_HEIGHT; + min: VOLUME_BUTTON_WIDTH VOLUME_BUTTON_WIDTH; fixed: 1 1; align: 0 0; - color: 0 0 0 0; + color: 255 0 0 100; + visible: 0; } dragable { @@ -260,24 +252,59 @@ collections { description { state: "default" 0.0; visible: 1; - min: VOLUME_POPUP_BUTTON_WIDTH VOLUME_POPUP_BUTTON_HEIGHT; - max: VOLUME_POPUP_BUTTON_WIDTH VOLUME_POPUP_BUTTON_HEIGHT; + min: VOLUME_CIRCLE_W VOLUME_CIRCLE_H; + max: VOLUME_CIRCLE_W VOLUME_CIRCLE_H; fixed: 1 1; align: 0.5 0.5; rel1 { relative: 0.5 0.5; to: "pv.volume.popup.playing";} rel2 { relative: 0.5 0.5; to: "pv.volume.popup.playing";} image { normal: "volume/T01_2_volume_popup_progress_handle.png";} - color: 255 255 255 255; + color: 10 14 74 255; } description { - state: "press" 0.0; - inherit: "default"; + state: "select" 0.0; + inherit: "default" 0.0; + min: VOLUME_CIRCLE_PRESS_W VOLUME_CIRCLE_PRESS_H; + max: VOLUME_CIRCLE_PRESS_W VOLUME_CIRCLE_PRESS_H; image { normal: "volume/T01_2_volume_popup_progress_handle_press.png";} + color: 10 14 74 255; + } + } + + part { + name: "pv.volume.popup.point.focus"; + type: SWALLOW; + mouse_events: 0; + scale: 1; + description { + state: "default" 0.0; + visible: 1; + min: VOLUME_BUTTON_WIDTH VOLUME_BUTTON_HEIGHT; + fixed: 1 1; + rel1 { relative: 0.0 0.0; to: "pv.volume.popup.point"; } + rel2 { relative: 1.0 1.0; to: "pv.volume.popup.point"; } + color: 255 255 255 0; } } } /* parts */ programs { + + program { + name: "volume_select"; + source: "volume.popup.point"; + signal: "volume,select"; + action: STATE_SET "select" 0.0; + target: "pv.volume.popup.point"; + } + program { + name: "volume_unselect"; + source: "volume.popup.point"; + signal: "volume,unselect"; + action: STATE_SET "default" 0.0; + target: "pv.volume.popup.point"; + } + program { name: "set_mute"; signal: "set,mute"; source: "volume.popup.icon"; @@ -290,21 +317,7 @@ collections { action: STATE_SET "default" 0.0; target: "pv.volume.popup.icon"; } - program { - name: "pv.volume.down"; - source: "pv.volume.popup.point"; - signal: "mouse,down,1"; - action: STATE_SET "press" 0.0; - target: "pv.volume.popup.point"; - } - program { - name: "pv.volume.up"; - source: "pv.volume.popup.point"; - signal: "mouse,up,1"; - action: STATE_SET "default" 0.0; - target: "pv.volume.popup.point"; - } - } /* programs */ + } /* programs */ } /* group */ } /* collections */ diff --git a/playview/res/edje/pv-volume.edc b/playview/res/edje/pv-volume.edc index 9d9be06..f0d8727 100755 --- a/playview/res/edje/pv-volume.edc +++ b/playview/res/edje/pv-volume.edc @@ -14,26 +14,31 @@ * limitations under the License. */ #include "pv-image.edc" +#include "custom/pv-custom-define.edc" -#define FONT_BOLD_TYPE "Tizen:style=Bold" +#define FONT_BOLD_TYPE "Tizen:style=Bold" -#define FONT_VOLUME_COLOR 255 255 255 255 +#define FONT_VOLUME_COLOR 255 255 255 255 -#define VOLUME_WIDGET_WIDTH 72 -#define VOLUME_WIDGET_PORTRAIT_HEIGHT 486 -#define VOLUME_WIDGET_LANDSCAPE_HEIGHT 264 +#define VOLUME_WIDGET_WIDTH 82 +#define VOLUME_WIDGET_PORTRAIT_HEIGHT 482 +#define VOLUME_WIDGET_LANDSCAPE_HEIGHT 482 -#define VOLUME_BUTTON_HEIGHT 40 -#define VOLUME_BUTTON_WIDTH 25 -#define VOLUME_PROGRESS_WIDTH 15 +#define VOLUME_BUTTON_HEIGHT 32 +#define VOLUME_BUTTON_WIDTH 32 +#define VOLUME_CIRCLE_H 24 +#define VOLUME_CIRCLE_W 24 +#define VOLUME_CIRCLE_PRESS_H 32 +#define VOLUME_CIRCLE_PRESS_W 32 +#define VOLUME_PROGRESS_WIDTH 4 externals { - external: "elm"; - external: "feedback"; + external: "elm"; + external: "feedback"; } collections { - base_scale : 2.6; + base_scale : CURRENT_BASE_SCALE; plugins { plugin { name: "touch_sound_plugin"; @@ -53,13 +58,13 @@ collections { description { state: "default" 0.0; visible : 1; - min: VOLUME_WIDGET_WIDTH VOLUME_WIDGET_PORTRAIT_HEIGHT; - max: VOLUME_WIDGET_WIDTH VOLUME_WIDGET_PORTRAIT_HEIGHT; + min: VOLUME_WIDGET_WIDTH VOLUME_WIDGET_LANDSCAPE_HEIGHT; + max: VOLUME_WIDGET_WIDTH VOLUME_WIDGET_LANDSCAPE_HEIGHT; fixed: 1 1; - align: 0.2 0.0; - rel1 { relative: 0.5 0.5;} - rel2 { relative: 0.5 0.5;} - image { normal: "volume/T01_2_volume_popup_bg.png"; border: 0 0 15 15; } + align: 0.0 0.0; + rel1 { relative: 0.0 0.0;} + rel2 { relative: 0.0 0.0;} + image { normal: "volume/T01_2_volume_popup_bg.png"; } } description { @@ -67,7 +72,7 @@ collections { inherit: "default" 0.0; min: VOLUME_WIDGET_WIDTH VOLUME_WIDGET_LANDSCAPE_HEIGHT; max: VOLUME_WIDGET_WIDTH VOLUME_WIDGET_LANDSCAPE_HEIGHT; - image { normal: "volume/T01_2_volume_popup_bg.png"; border: 0 0 15 15; } + image { normal: "volume/T01_2_volume_popup_bg.png"; } } } @@ -77,7 +82,7 @@ collections { scale: 1; description { state: "default" 0.0; - min: 0 32; + min: 0 44; fixed: 1 1; align: 0.0 0.0; rel1 { relative: 0.0 0.0; to: "pv.volume.bg";} @@ -86,7 +91,7 @@ collections { description { state: "landscape" 0.0; inherit: "default" 0.0; - min: 0 16; + min: 0 44; } } @@ -96,7 +101,7 @@ collections { scale: 1; description { state: "default" 0.0; - min: 0 21; + min: 0 32; fixed: 1 1; align: 0.0 1.0; rel1 { relative: 0.0 1.0; to: "pv.volume.bg";} @@ -105,31 +110,50 @@ collections { description { state: "landscape" 0.0; inherit: "default" 0.0; - min: 0 12; + min: 0 32; } } part { - name: "pv.volume.txt"; - type: TEXT; + name: "pv.volume.icon.rect"; + type: RECT; mouse_events: 0; scale: 1; - effect: FAR_SHADOW BOTTOM; description { state: "default" 0.0; - visible : 1; - min: 0 16; + visible : 0; + min: 32 32; + max: 32 32; fixed: 1 1; align: 0.5 1.0; - rel1 { relative: 0.0 0.0; to: "pv.volume.bottom.padding";} - rel2 { relative: 1.0 0.0; to: "pv.volume.bottom.padding";} - text { - size: 38; - } + rel1 { relative: 0.5 0.0; to_x: "pv.volume.bg"; to_y: "pv.volume.bottom.padding";} + rel2 { relative: 0.5 0.0; to_x: "pv.volume.bg"; to_y: "pv.volume.bottom.padding";} + } + } + part { + name: "pv.volume.icon"; + type: IMAGE; + mouse_events: 0; + scale: 1; + description { + state: "default" 0.0; + visible : 1; + min: 27 24; + max: 27 24; + align: 0.5 0.5; + rel1 { relative: 0.0 0.0; to: pv.volume.icon.rect;} + rel2 { relative: 1.0 1.0; to: pv.volume.icon.rect;} + image { normal: "popup/T01-2_volume_popup_icon_volume01.png"; } + } + description { + state: "mute" 0.0; + inherit: "default" 0.0; + image { normal: "popup/T01-2_volume_popup_icon_volume02.png"; } } } + part { name: "pv.volume.txt.padding"; type: RECT; @@ -138,16 +162,16 @@ collections { description { state: "default" 0.0; visible : 0; - min: 0 21; + min: 0 12; fixed: 1 1; align: 0.0 1.0; - rel1 { relative: 0.0 0.0; to: "pv.volume.txt";} - rel2 { relative: 1.0 0.0; to: "pv.volume.txt";} + rel1 { relative: 0.0 0.0; to: "pv.volume.icon";} + rel2 { relative: 1.0 0.0; to: "pv.volume.icon";} } description { state: "landscape" 0.0; inherit: "default" 0.0; - min: 0 20; + min: 0 12; } } @@ -177,7 +201,7 @@ collections { align: 0.5 0.0; rel1 { relative: 0.5 1.0; to_x : "pv.volume.bg"; to_y : "pv.volume.top.padding";} rel2 { relative: 0.5 0.0; to_x : "pv.volume.bg"; to_y : "pv.volume.txt.padding";} - image { normal: "volume/T01_2_volume_popup_progress_bg.png"; border: 0 0 5 5;} + image { normal: "volume/T01_2_volume_popup_progress_bg.png"; } } } @@ -193,8 +217,8 @@ collections { fixed: 1 0; align: 0.0 0.0; rel1 { relative: 0.0 0.5; to_x : "pv.volume.bar.bg"; to_y: "pv.volume.point"; } - rel2 { relative: 1.0 1.0; to : "pv.volume.bar.bg"; offset: 0 1;} - image { normal: "volume/T01_2_volume_popup_progress_bar.png"; border: 0 0 5 5;} + rel2 { relative: 1.0 1.0; to : "pv.volume.bar.bg";} + image { normal: "volume/T01_2_volume_popup_progress_bar.png";} } } @@ -203,8 +227,8 @@ collections { scale: 1; mouse_events: 0; description{ state: "default" 0.0; - rel1 { relative: 0.5 0.0; to: "pv.volume.bar.bg"; offset: 0 -7; } - rel2 { relative: 0.5 1.0; to: "pv.volume.bar.bg"; offset: 0 7;} + rel1 { relative: 0.5 0.0; to: "pv.volume.bar.bg"; offset: 0 -4;} + rel2 { relative: 0.5 1.0; to: "pv.volume.bar.bg"; offset: 0 +4;} min: VOLUME_BUTTON_WIDTH 0; fixed: 1 0; align: 0.5 0.0; @@ -219,7 +243,6 @@ collections { description { state: "default" 0.0; min: VOLUME_BUTTON_WIDTH VOLUME_BUTTON_HEIGHT; - max: VOLUME_BUTTON_WIDTH VOLUME_BUTTON_HEIGHT; fixed: 1 1; align: 0 0; color: 0 0 0 0; @@ -240,19 +263,22 @@ collections { description { state: "default" 0.0; visible: 1; - min: VOLUME_BUTTON_WIDTH VOLUME_BUTTON_HEIGHT; - max: VOLUME_BUTTON_WIDTH VOLUME_BUTTON_HEIGHT; + min: VOLUME_CIRCLE_W VOLUME_CIRCLE_H; + max: VOLUME_CIRCLE_W VOLUME_CIRCLE_H; fixed: 1 1; align: 0.5 0.5; rel1 { relative: 0.5 0.5; to: "pv.volume.playing";} rel2 { relative: 0.5 0.5; to: "pv.volume.playing";} image { normal: "volume/T01_2_volume_popup_progress_handle.png";} - color: 255 255 255 255; + color: 10 14 74 255; } description { state: "press" 0.0; inherit: "default"; + min: VOLUME_CIRCLE_PRESS_W VOLUME_CIRCLE_PRESS_H; + max: VOLUME_CIRCLE_PRESS_W VOLUME_CIRCLE_PRESS_H; image { normal: "volume/T01_2_volume_popup_progress_handle_press.png";} + color: 10 14 74 255; } } @@ -283,6 +309,7 @@ collections { target: "pv.volume.top.padding"; target: "pv.volume.bottom.padding"; target: "pv.volume.txt.padding"; + target: "pv.volume.icon.rect"; } program { @@ -294,7 +321,22 @@ collections { target: "pv.volume.top.padding"; target: "pv.volume.bottom.padding"; target: "pv.volume.txt.padding"; + target: "pv.volume.icon.rect"; + } + + program { name: "set_mute"; + signal: "set,mute"; + source: "volume.popup.icon"; + action: STATE_SET "mute" 0.0; + target: "pv.volume.icon"; + } + program { name: "set_volume"; + signal: "set,volume"; + source: "volume.popup.icon"; + action: STATE_SET "default" 0.0; + target: "pv.volume.icon"; } + program { name: "pv.volume.down"; source: "pv.volume.point"; diff --git a/playview/src/widget/vp-play-brightness-popup.c b/playview/src/widget/vp-play-brightness-popup.c index 06a0810..d1fb848 100755 --- a/playview/src/widget/vp-play-brightness-popup.c +++ b/playview/src/widget/vp-play-brightness-popup.c @@ -30,8 +30,8 @@ #define VP_BRIGHTNESS_HIDE_LAYOUT_TIMER_INTERVAL 5.0 -#define VP_BRIGHTNESS_PORTRAIT_POS_X 275 -#define VP_BRIGHTNESS_PORTRAIT_POS_Y 150 +#define VP_BRIGHTNESS_PORTRAIT_POS_X 4 +#define VP_BRIGHTNESS_PORTRAIT_POS_Y 57 #define VP_BRIGHTNESS_PORTRAIT_HEIGHT 572 #define VP_BRIGHTNESS_LANDSCAPE_POS_X 450 @@ -300,8 +300,8 @@ static void _vp_play_brightness_set_widget_position(BrightnessWidget * VP_BRIGHTNESS_LANDSCAPE_POS_X * VP_SCALE, VP_BRIGHTNESS_LANDSCAPE_POS_Y * VP_SCALE); } else { - evas_object_move(pBrightnessWidget->pLayout, - nWidth - VP_BRIGHTNESS_PORTRAIT_POS_X * VP_SCALE, + evas_object_move(pBrightnessWidget->pLayout, + VP_BRIGHTNESS_PORTRAIT_POS_X * VP_SCALE, VP_BRIGHTNESS_PORTRAIT_POS_Y * VP_SCALE); } } @@ -312,8 +312,7 @@ static void _vp_play_brightness_set_widget_position(BrightnessWidget * * @param nValueRatio */ static void _vp_play_brightness_update_icon(BrightnessWidget * - pBrightnessWidget, - double nValueRatio) + pBrightnessWidget ) { if (pBrightnessWidget == NULL) { VideoLogError("pBrightnessWidget is NULL"); @@ -324,22 +323,17 @@ static void _vp_play_brightness_update_icon(BrightnessWidget * VideoLogError("pBrightnessWidget->pIcon is NULL"); return; } - char edj_path[1024] = { 0 }; + char image_path[2048] = { 0 }; char *path = app_get_resource_path(); - snprintf(edj_path, 1024, "%s%s/%s", path, "edje", - VP_PLAY_RESROUCE_EDJ_PATH); + if (!path){ + VideoLogError("Resource path is NULL"); + return; + } + snprintf(image_path, 2048, "%s%s/%s", path, "/edje/images/", "brightness/quick_icon_brightness.png"); free(path); - gchar *popup_path = NULL; - int req = 0; - if (pBrightnessWidget->nCurVal == pBrightnessWidget->nMaxVal) { - req = VP_BRIGHTNESS_ICON_NUM - 1; - } else if (pBrightnessWidget->nCurVal > pBrightnessWidget->nMinVal) { - req = (int) (nValueRatio * (VP_BRIGHTNESS_ICON_NUM - 2) + 1); - } - popup_path = g_strdup_printf(VP_PLAY_BRIGHTNESS_POPUP_ICON_PATH, req); - elm_image_file_set(pBrightnessWidget->pIcon, edj_path, popup_path); - g_free(popup_path); + elm_image_file_set(pBrightnessWidget->pIcon, image_path, NULL); + } /** @@ -355,10 +349,6 @@ static void _vp_play_brightness_update_value(BrightnessWidget * } double nValueRatio = 0.0; - char szPlayingTime[VP_BRIGHTNESS_TEXT_MAX_LEN] = { 0, }; - - snprintf(szPlayingTime, VP_BRIGHTNESS_TEXT_MAX_LEN, "%d", - pBrightnessWidget->nCurVal); nValueRatio = ((double) pBrightnessWidget->nCurVal / @@ -371,11 +361,6 @@ static void _vp_play_brightness_update_value(BrightnessWidget * VideoLogWarning("Drag value set fail : %lf", nValueRatio); } - elm_object_part_text_set(pBrightnessWidget->pLayout, - VP_PLAY_SWALLOW_BRIGHTNESS_POPUP_VALUE_LABEL, - szPlayingTime); - /*update brightness icon */ - _vp_play_brightness_update_icon(pBrightnessWidget, nValueRatio); } /** @@ -541,6 +526,9 @@ static bool _vp_play_brightness_init_layout(BrightnessWidget * VideoLogError("_vp_play_brightness_create_icon is fail"); return FALSE; } + _vp_play_brightness_update_icon(pBrightnessWidget); + + elm_object_signal_emit(pBrightnessWidget->pLayout, "brightness,unselect", "brightness.popup.point"); evas_object_event_callback_add(pBrightnessWidget->pLayout, EVAS_CALLBACK_MOUSE_DOWN, @@ -678,6 +666,8 @@ bool vp_play_brightness_unrealize(brightness_handle pBrightnessHandle) BrightnessWidget *pBrightnessWidget = (BrightnessWidget *) pBrightnessHandle; + elm_object_signal_emit(pBrightnessWidget->pLayout, "brightness,unselect", "brightness.popup.point"); + pBrightnessWidget->bIsRealize = FALSE; evas_object_hide(pBrightnessWidget->pLayout); @@ -766,6 +756,8 @@ bool vp_play_brightness_set_value(brightness_handle pBrightnessHandle, _vp_play_brightness_set_value(pBrightnessWidget, pBrightnessWidget->nCurVal); + + elm_object_signal_emit(pBrightnessWidget->pLayout, "brightness,select", "brightness.popup.point"); return TRUE; } diff --git a/playview/src/widget/vp-play-volume-popup.c b/playview/src/widget/vp-play-volume-popup.c index 071b257..68cd87c 100755 --- a/playview/src/widget/vp-play-volume-popup.c +++ b/playview/src/widget/vp-play-volume-popup.c @@ -28,8 +28,8 @@ #define VP_VOLUME_POPUP_HIDE_LAYOUT_TIMER_INTERVAL 5.0 -#define VP_VOLUME_POPUP_PORTRAIT_POS_X 220 -#define VP_VOLUME_POPUP_PORTRAIT_POS_Y 150 +#define VP_VOLUME_POPUP_PORTRAIT_POS_X 662 +#define VP_VOLUME_POPUP_PORTRAIT_POS_Y 57 #define VP_VOLUME_POPUP_PORTRAIT_HEIGHT 572 #define VP_VOLUME_POPUP_LANDSCAPE_POS_X 400 @@ -307,10 +307,7 @@ static void _vp_play_volume_popup_update_value(VolumePopupWidget * } double nVolumeRatio = 0.0; - char szPlayingTime[VP_VOLUME_POPUP_TEXT_MAX_LEN] = { 0, }; - snprintf(szPlayingTime, VP_VOLUME_POPUP_TEXT_MAX_LEN, "%d", - pVolumeWidget->nCurVal); nVolumeRatio = ((double) pVolumeWidget->nCurVal / @@ -322,9 +319,7 @@ static void _vp_play_volume_popup_update_value(VolumePopupWidget * VideoLogWarning("Drag value set fail : %lf", nVolumeRatio); } - elm_object_part_text_set(pVolumeWidget->pLayout, - VP_PLAY_SWALLOW_VOLUME_POPUP_VALUE_LABEL, - szPlayingTime); + if (pVolumeWidget->nCurVal == 0) { edje_object_signal_emit(_EDJ(pVolumeWidget->pLayout), "set,mute", @@ -377,6 +372,7 @@ static void _vp_play_volume_popup_set_value(VolumePopupWidget * _vp_play_volume_popup_update_value(pVolumeWidget); + elm_object_signal_emit(pVolumeWidget->pLayout, "volume,select", "volume.popup.point"); if (pVolumeWidget->pDeviceTimer == NULL) { pVolumeWidget->pDeviceTimer = ecore_timer_add(0.1, __vp_volume_popup_device_timer_cb, @@ -465,6 +461,8 @@ static bool _vp_play_volume_popup_init_layout(VolumePopupWidget * VideoLogError("_vp_play_volume_create_layout is fail"); return FALSE; } + + elm_object_signal_emit(pVolumeWidget->pLayout, "volume,unselect", "volume.popup.point"); evas_object_event_callback_add(pVolumeWidget->pLayout, EVAS_CALLBACK_MOUSE_DOWN, __vp_volume_popup_mouse_down_cb, @@ -589,6 +587,8 @@ bool vp_play_volume_popup_unrealize(volume_popup_handle pVolumeHandle) pVolumeWidget->bIsRealize = FALSE; + elm_object_signal_emit(pVolumeWidget->pLayout, "volume,unselect", "volume.popup.point"); + evas_object_hide(pVolumeWidget->pLayout); return TRUE; diff --git a/playview/src/widget/vp-play-volume.c b/playview/src/widget/vp-play-volume.c index 4b300a9..1572982 100755 --- a/playview/src/widget/vp-play-volume.c +++ b/playview/src/widget/vp-play-volume.c @@ -374,8 +374,8 @@ static void _vp_play_volume_set_widget_position(VolumeWidget * elm_object_signal_emit(pVolumeWidget->pLayout, VP_NORMAL_SIGNAL_VOLUME_PORTRAIT_MODE, "*"); - evas_object_move(pVolumeWidget->pLayout, w - w / 9, - (5 * h) / 16); + evas_object_move(pVolumeWidget->pLayout, 720, + 50); } } else if ((elm_config_scale_get() - 1.8) == 0.0) { if (bLandscape) { @@ -387,7 +387,7 @@ static void _vp_play_volume_set_widget_position(VolumeWidget * elm_object_signal_emit(pVolumeWidget->pLayout, VP_NORMAL_SIGNAL_VOLUME_PORTRAIT_MODE, "*"); - evas_object_move(pVolumeWidget->pLayout, w - w / 10, h / 5); + evas_object_move(pVolumeWidget->pLayout, 1191 ,102); } } else { if (bLandscape) { @@ -431,9 +431,14 @@ static void _vp_play_volume_update_value(VolumeWidget * pVolumeWidget) VideoLogWarning("Drag value set fail : %lf", nVolumeRatio); } - elm_object_part_text_set(pVolumeWidget->pLayout, - VP_PLAY_SWALLOW_VOLUME_VALUE_LABEL, - szPlayingTime); + if (pVolumeWidget->nCurVal == 0) { + edje_object_signal_emit(_EDJ(pVolumeWidget->pLayout), "set,mute", + "volume.popup.icon"); + } else { + edje_object_signal_emit(_EDJ(pVolumeWidget->pLayout), + "set,volume", "volume.popup.icon"); + } + } /** diff --git a/vp-main/res/edje/custom/pv-custom-button.edc b/vp-main/res/edje/custom/pv-custom-button.edc index c604c04..fde2d13 100755 --- a/vp-main/res/edje/custom/pv-custom-button.edc +++ b/vp-main/res/edje/custom/pv-custom-button.edc @@ -167,7 +167,7 @@ group { rel1.relative: 0.0 0.0; rel2.relative: 1.0 1.0; visible: 0; - color: 255 0 0 100; + color: 255 0 0 100; } description { state: "clicked" 0.0; @@ -357,7 +357,7 @@ group { inherit: "default" 0.0; } } - + part { name: "elm.text"; type: TEXT; @@ -513,8 +513,8 @@ group { state: "default" 0.0; rel1.relative: 0.0 0.0; rel2.relative: 1.0 1.0; - max: 21 24; - min: 21 24; + max: 21 24; + min: 21 24; visible: 1; image { normal: "control/T01-2_control_circle_icon_rewind.png";} } @@ -531,22 +531,8 @@ group { inherit: "default" 0.0; } } - - part { - name: "button_imageAMIT"; - type: IMAGE; - 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; - color: 255 0 0 100; - visible: 1; - } - } - + + part { name: "elm.text"; type: TEXT; @@ -2503,7 +2489,7 @@ group { visible: 1; min: 28 25; max: 28 25; - align: 0.5 0.5; + align: 0.5 0.5; rel1 {relative: 0.0 0.0; to:"button_image"; } rel2 @@ -2526,7 +2512,7 @@ group { min: 28 25; max: 28 25; align: 0.5 0.5; - rel1 + rel1 { relative: 0.0 0.0; to:"button_image"; } rel2 {relative: 1.0 1.0; to:"button_image"; } @@ -2547,8 +2533,8 @@ group { visible: 0; min: 28 25; max: 28 25; - align: 0.5 0.5; - rel1 + align: 0.5 0.5; + rel1 { relative: 0.0 0.0; to:"button_image"; } rel2 {relative: 1.0 1.0; to:"button_image"; } @@ -2697,7 +2683,7 @@ group { parts { part { name: "button_image"; - type: RECT; + type: RECT; description { state: "default" 0.0; color:0 0 255 255; @@ -2727,7 +2713,7 @@ group { min: 32 26; max: 32 26; fixed: 1 1; - rel1 + rel1 {relative: 0.0 0.0; to:"button_image";} rel2 {relative: 1.0 1.0; to:"button_image";} @@ -2749,7 +2735,7 @@ group { min: 32 26; max: 32 26; fixed: 1 1; - rel1 + rel1 {relative: 0.0 0.0; to:"button_image";} rel2 {relative: 1.0 1.0; to:"button_image";} @@ -2771,7 +2757,7 @@ group { min: 32 26; max: 32 26; fixed: 1 1; - rel1 + rel1 {relative: 0.0 0.0; to:"button_image";} rel2 {relative: 1.0 1.0; to:"button_image";} @@ -2782,7 +2768,7 @@ group { visible: 1; } } - + part { name: "elm.text"; type: TEXT; diff --git a/vp-main/res/edje/images/brightness/quick_icon_brightness.png b/vp-main/res/edje/images/brightness/quick_icon_brightness.png new file mode 100755 index 0000000..c4f6af8 Binary files /dev/null and b/vp-main/res/edje/images/brightness/quick_icon_brightness.png differ diff --git a/vp-main/res/edje/images/popup/T01-2_volume_popup_icon_volume01.png b/vp-main/res/edje/images/popup/T01-2_volume_popup_icon_volume01.png index fd96325..f98d442 100755 Binary files a/vp-main/res/edje/images/popup/T01-2_volume_popup_icon_volume01.png and b/vp-main/res/edje/images/popup/T01-2_volume_popup_icon_volume01.png differ diff --git a/vp-main/res/edje/images/popup/T01-2_volume_popup_icon_volume02.png b/vp-main/res/edje/images/popup/T01-2_volume_popup_icon_volume02.png index ee5340f..cd047c8 100755 Binary files a/vp-main/res/edje/images/popup/T01-2_volume_popup_icon_volume02.png and b/vp-main/res/edje/images/popup/T01-2_volume_popup_icon_volume02.png differ diff --git a/vp-main/res/edje/images/volume/T01_2_volume_popup_bg.png b/vp-main/res/edje/images/volume/T01_2_volume_popup_bg.png index 2069958..262a0e9 100755 Binary files a/vp-main/res/edje/images/volume/T01_2_volume_popup_bg.png and b/vp-main/res/edje/images/volume/T01_2_volume_popup_bg.png differ diff --git a/vp-main/res/edje/images/volume/T01_2_volume_popup_progress_bar.png b/vp-main/res/edje/images/volume/T01_2_volume_popup_progress_bar.png index 509ecbb..ebdc86a 100755 Binary files a/vp-main/res/edje/images/volume/T01_2_volume_popup_progress_bar.png and b/vp-main/res/edje/images/volume/T01_2_volume_popup_progress_bar.png differ diff --git a/vp-main/res/edje/images/volume/T01_2_volume_popup_progress_bg.png b/vp-main/res/edje/images/volume/T01_2_volume_popup_progress_bg.png index f789938..090da8a 100755 Binary files a/vp-main/res/edje/images/volume/T01_2_volume_popup_progress_bg.png and b/vp-main/res/edje/images/volume/T01_2_volume_popup_progress_bg.png differ diff --git a/vp-main/res/edje/images/volume/T01_2_volume_popup_progress_handle.png b/vp-main/res/edje/images/volume/T01_2_volume_popup_progress_handle.png index 68105d1..34baf91 100755 Binary files a/vp-main/res/edje/images/volume/T01_2_volume_popup_progress_handle.png and b/vp-main/res/edje/images/volume/T01_2_volume_popup_progress_handle.png differ diff --git a/vp-main/res/edje/images/volume/T01_2_volume_popup_progress_handle_press.png b/vp-main/res/edje/images/volume/T01_2_volume_popup_progress_handle_press.png index 88eb56f..54b8169 100755 Binary files a/vp-main/res/edje/images/volume/T01_2_volume_popup_progress_handle_press.png and b/vp-main/res/edje/images/volume/T01_2_volume_popup_progress_handle_press.png differ diff --git a/vp-main/res/edje/pv-brightness-popup.edc b/vp-main/res/edje/pv-brightness-popup.edc index 0e0be15..cf468c1 100755 --- a/vp-main/res/edje/pv-brightness-popup.edc +++ b/vp-main/res/edje/pv-brightness-popup.edc @@ -14,14 +14,16 @@ * limitations under the License. */ #include "pv-image.edc" +#include "custom/pv-custom-define.edc" #define FONT_BOLD_TYPE "Tizen:style=Bold" - #define FONT_VOLUME_COLOR 255 255 255 255 +#define BRIGHTNESS_WIDGET_WIDTH 82 +#define BRIGHTNESS_LANDSCAPE_HEIGHT 482 collections { - base_scale : 1.6; + base_scale : CURRENT_BASE_SCALE; group { name: "pv.brightness.popup"; parts { @@ -34,7 +36,7 @@ collections { description { state: "default" 0.0; visible : 1; - min: 58 286; + min: BRIGHTNESS_WIDGET_WIDTH BRIGHTNESS_LANDSCAPE_HEIGHT; fixed: 1 1; align: 0.0 0.0; rel1 { relative: 0.0 0.0;} @@ -51,109 +53,81 @@ collections { description { state: "default" 0.0; visible : 1; - min: 58 286; + min: BRIGHTNESS_WIDGET_WIDTH BRIGHTNESS_LANDSCAPE_HEIGHT; fixed: 1 1; align: 0.0 0.0; rel1 { relative: 0.0 0.0;} - rel2 { relative: 0.0 0.5;} + rel2 { relative: 0.0 0.0;} color: 255 255 255 255; - image { normal: "volume/T01_2_volume_popup_bg.png"; border: 0 0 29 29;} + image { normal: "volume/T01_2_volume_popup_bg.png";} } } part { - name: "pv.brightness.popup.icon.padding"; + name: "pv.brightness.popup.top.padding"; type: RECT; mouse_events: 0; scale: 1; description { state: "default" 0.0; visible : 0; - min: 0 12; + min: 0 44; fixed: 1 1; align: 0.0 0.0; rel1 { relative: 0.0 0.0; to: "pv.brightness.popup.bg";} rel2 { relative: 1.0 0.0; to: "pv.brightness.popup.bg";} color: 255 0 0 255; - } } part { - name: "pv.brightness.popup.icon"; - type: SWALLOW; - mouse_events: 0; - scale: 1; - description { - state: "default" 0.0; - visible : 1; - min: 22 22; - fixed: 1 1; - align: 0.5 0.0; - rel1 { relative: 0.5 1.0; to_x: "pv.brightness.popup.bg"; to_y: "pv.brightness.popup.icon.padding";} - rel2 { relative: 0.5 1.0; to_x: "pv.brightness.popup.bg"; to_y: "pv.brightness.popup.icon.padding";} - } - } - - part { - name: "pv.brightness.popup.top.padding"; + name: "pv.brightness.popup.bottom.padding"; type: RECT; mouse_events: 0; scale: 1; description { state: "default" 0.0; visible : 0; - min: 0 11; + min: 0 32; fixed: 1 1; - align: 0.0 0.0; - rel1 { relative: 0.0 1.0; to: "pv.brightness.popup.icon";} - rel2 { relative: 1.0 1.0; to: "pv.brightness.popup.icon";} + align: 0.0 1.0; + rel1 { relative: 0.0 1.0; to: "pv.brightness.popup.bg";} + rel2 { relative: 1.0 1.0; to: "pv.brightness.popup.bg";} color: 255 0 0 255; - } } part { - name: "pv.brightness.popup.bottom.padding"; + name: "pv.brightness.popup.icon.rect"; type: RECT; mouse_events: 0; scale: 1; description { state: "default" 0.0; visible : 0; - min: 0 18; + min: 32 32; + max: 32 32; fixed: 1 1; - align: 0.0 1.0; - rel1 { relative: 0.0 1.0; to: "pv.brightness.popup.bg";} - rel2 { relative: 1.0 1.0; to: "pv.brightness.popup.bg";} - color: 255 0 0 255; - + align: 0.5 1.0; + rel1 { relative: 0.5 0.0; to_x: "pv.brightness.popup.bg"; to_y: "pv.brightness.popup.bottom.padding";} + rel2 { relative: 0.5 0.0; to_x: "pv.brightness.popup.bg"; to_y: "pv.brightness.popup.bottom.padding";} } } part { - name: "pv.brightness.popup.txt"; - type: TEXT; + name: "pv.brightness.popup.icon"; + type: SWALLOW; mouse_events: 0; scale: 1; - effect: FAR_SHADOW BOTTOM; description { state: "default" 0.0; visible : 1; - min: 0 23; + min: 30 30; + max: 30 30; fixed: 1 1; - align: 0.5 1.0; - rel1 { relative: 0.0 0.0; to: "pv.brightness.popup.bottom.padding";} - rel2 { relative: 1.0 0.0; to: "pv.brightness.popup.bottom.padding";} - color: FONT_VOLUME_COLOR; - color3: 51 57 72 255; - text { - font: FONT_BOLD_TYPE; - size: 21; - text: "3"; - align: 0.5 0.5; - } - + align: 0.5 0.5; + rel1 { relative: 0.0 0.0; to: pv.brightness.popup.icon.rect;} + rel2 { relative: 1.0 1.0; to: pv.brightness.popup.icon.rect;} } } @@ -165,13 +139,11 @@ collections { description { state: "default" 0.0; visible : 0; - min: 0 11; - fixed: 0 1; + min: 0 12; + fixed: 1 1; align: 0.0 1.0; - rel1 { relative: 0.0 0.0; to: "pv.brightness.popup.txt";} - rel2 { relative: 1.0 0.0; to: "pv.brightness.popup.txt";} - color: 255 0 0 255; - + rel1 { relative: 0.0 0.0; to: "pv.brightness.popup.icon";} + rel2 { relative: 1.0 0.0; to: "pv.brightness.popup.icon";} } } @@ -183,12 +155,12 @@ collections { description { state: "default" 0.0; visible: 1; - min: 6 0; + min: 4 0; fixed: 1 0; align: 0.5 0.5; rel1 { relative: 0.5 1.0; to_x : "pv.brightness.popup.bg"; to_y : "pv.brightness.popup.top.padding";} rel2 { relative: 0.5 0.0; to_x : "pv.brightness.popup.bg"; to_y : "pv.brightness.popup.txt.padding";} - image { normal: "volume/T01_2_volume_popup_progress_bg.png"; border: 0 0 19 19;} + image { normal: "volume/T01_2_volume_popup_progress_bg.png";} color: 255 255 255 255; } } @@ -201,7 +173,7 @@ collections { description { state: "default" 0.0; visible: 0; - min: 0 22; + min: 0 24; fixed: 0 1; align: 0.5 0.0; rel1 { relative: 0.0 0.0; to : "pv.brightness.popup.bar.bg"; } @@ -218,7 +190,7 @@ collections { description { state: "default" 0.0; visible: 0; - min: 0 22; + min: 0 24; fixed: 0 1; align: 0.5 1.0; rel1 { relative: 0.0 1.0; to : "pv.brightness.popup.bar.bg"; } @@ -244,7 +216,6 @@ collections { } } - part { name: "pv.brightness.popup.step"; type: IMAGE; @@ -253,16 +224,16 @@ collections { description { state: "default" 0.0; visible: 1; - min: 6 0; + min: 4 0; fixed: 1 0; align: 0.0 0.0; rel1 { relative: 0.0 0.5; to_x : "pv.brightness.popup.bar.bg"; to_y: "pv.brightness.popup.circle"; } - rel2 { relative: 1.0 1.0; to_x : "pv.brightness.popup.bar.bg"; to_y: "pv.brightness.popup.bar.bg"; offset: 0 2; } - color: 255 255 255 255; - image { normal: "volume/T01_2_volume_popup_progress_bar.png"; border: 0 0 10 10;} + rel2 { relative: 1.0 1.0; to : "pv.brightness.popup.bar.bg"; } + image { normal: "volume/T01_2_volume_popup_progress_bar.png";} color: 255 255 255 255; } } + part { name: "pv.brightness.popup.confine.rect"; type: RECT; @@ -272,9 +243,9 @@ collections { state: "default" 0.0; visible: 1; align: 0.5 0.0; - min: 24 0; - rel1 { relative: 0.5 0.0; to: "pv.brightness.popup.bar.bg"; offset: 0 -11; } - rel2 { relative: 0.5 1.0; to: "pv.brightness.popup.bar.bg"; offset: 0 11; } + min: 32 0; + rel1 { relative: 0.5 0.0; to: "pv.brightness.popup.bar.bg"; offset: 0 -4;} + rel2 { relative: 0.5 1.0; to: "pv.brightness.popup.bar.bg"; offset: 0 +4;} color: 255 255 255 0; } } @@ -290,11 +261,12 @@ collections { min: 24 24; fixed: 1 1; align: 0.5 0.5; - rel1 { relative: 0.5 0.5; to_x: "pv.brightness.popup.bar.rect"; to_y: "pv.brightness.popup.playing"; } - rel2 { relative: 0.5 0.5; to_x: "pv.brightness.popup.bar.rect"; to_y: "pv.brightness.popup.playing"; } + rel1 { relative: 0.5 0.5; to_x: "pv.brightness.popup.bar.bg"; to_y: "pv.brightness.popup.playing"; } + rel2 { relative: 0.5 0.5; to_x: "pv.brightness.popup.bar.bg"; to_y: "pv.brightness.popup.playing"; } color: 255 255 255 255; } } + part { name: "pv.brightness.popup.playing"; type: RECT; @@ -303,8 +275,8 @@ collections { description { state: "default" 0.0; visible: 0; - min: 24 24; - fixed: 0 0; + min: 32 32; + fixed: 1 1; align: 0.0 0.0; } dragable { @@ -314,7 +286,6 @@ collections { } } - part { name: "pv.brightness.popup.point"; type: IMAGE; @@ -329,9 +300,35 @@ collections { rel1 { relative: 0.5 0.5; to: "pv.brightness.popup.playing"; } rel2 { relative: 0.5 0.5; to: "pv.brightness.popup.playing"; } image { normal: "volume/T01_2_volume_popup_progress_handle.png";} - color: 255 255 255 255; + color: 10 14 74 255; + } + description { + state: "select" 0.0; + inherit: "default" 0.0; + min: 32 32; + max: 32 32; + image { normal: "volume/T01_2_volume_popup_progress_handle_press.png";} + color: 10 14 74 255; } } + + programs { + program { + name: "brightness_select"; + source: "brightness.popup.point"; + signal: "brightness,select"; + action: STATE_SET "select" 0.0; + target: "pv.brightness.popup.point"; + } + program { + name: "brightness_unselect"; + source: "brightness.popup.point"; + signal: "brightness,unselect"; + action: STATE_SET "default" 0.0; + target: "pv.brightness.popup.point"; + } + + } /* programs */ } /* parts */ } /* group */ } /* collections */ diff --git a/vp-main/res/edje/pv-volume-popup.edc b/vp-main/res/edje/pv-volume-popup.edc index 3935957..1336f36 100755 --- a/vp-main/res/edje/pv-volume-popup.edc +++ b/vp-main/res/edje/pv-volume-popup.edc @@ -14,171 +14,165 @@ * limitations under the License. */ #include "pv-image.edc" +#include "custom/pv-custom-define.edc" -#define FONT_BOLD_TYPE "Tizen:style=Bold" +#define FONT_BOLD_TYPE "Tizen:style=Bold" -#define FONT_VOLUME_COLOR 255 255 255 255 -#define VOLUME_POPUP_BUTTON_HEIGHT 24 -#define VOLUME_POPUP_BUTTON_WIDTH 24 +#define FONT_VOLUME_COLOR 255 255 255 255 + +#define VOLUME_WIDGET_WIDTH 82 +#define VOLUME_WIDGET_PORTRAIT_HEIGHT 482 +#define VOLUME_WIDGET_LANDSCAPE_HEIGHT 482 + +#define VOLUME_BUTTON_HEIGHT 32 +#define VOLUME_BUTTON_WIDTH 32 +#define VOLUME_CIRCLE_H 24 +#define VOLUME_CIRCLE_W 24 +#define VOLUME_CIRCLE_PRESS_H 32 +#define VOLUME_CIRCLE_PRESS_W 32 +#define VOLUME_PROGRESS_WIDTH 4 collections { - base_scale : 1.6; + base_scale : CURRENT_BASE_SCALE; group { name: "pv.volume.popup"; parts { part { - name: "pv.volume.popup.rect"; - type: RECT; - mouse_events: 1; + name: "pv.volume.popup.bg"; + type: IMAGE; + mouse_events: 0; repeat_events: 0; scale: 1; description { state: "default" 0.0; visible : 1; - min: 58 286; + min: VOLUME_WIDGET_WIDTH VOLUME_WIDGET_LANDSCAPE_HEIGHT; + max: VOLUME_WIDGET_WIDTH VOLUME_WIDGET_LANDSCAPE_HEIGHT; fixed: 1 1; align: 0.0 0.0; - rel1 { relative: 0.5 0.5;} - rel2 { relative: 0.5 0.5;} - color: 0 0 0 0; + rel1 { relative: 0.0 0.0;} + rel2 { relative: 0.0 0.0;} + image { normal: "volume/T01_2_volume_popup_bg.png"; } } - } - part { - name: "pv.volume.popup.bg"; - type: IMAGE; - mouse_events: 0; - scale: 1; description { - state: "default" 0.0; - visible : 1; - min: 58 286; - fixed: 1 1; - align: 0.0 0.0; - rel1 { relative: 0.5 0.5;} - rel2 { relative: 0.5 0.5;} - color: 255 255 255 255; - image { normal: "volume/T01_2_volume_popup_bg.png"; border: 0 0 15 15;} + state: "landscape" 0.0; + inherit: "default" 0.0; + min: VOLUME_WIDGET_WIDTH VOLUME_WIDGET_LANDSCAPE_HEIGHT; + max: VOLUME_WIDGET_WIDTH VOLUME_WIDGET_LANDSCAPE_HEIGHT; + image { normal: "volume/T01_2_volume_popup_bg.png"; } } } part { - name: "pv.volume.popup.icon.padding"; - type: RECT; - mouse_events: 0; + name: "pv.volume.popup.top.padding"; + type: SPACER; scale: 1; description { state: "default" 0.0; - visible : 0; - min: 0 12; + min: 0 44; fixed: 1 1; align: 0.0 0.0; rel1 { relative: 0.0 0.0; to: "pv.volume.popup.bg";} rel2 { relative: 1.0 0.0; to: "pv.volume.popup.bg";} - color: 255 0 0 255; - + } + description { + state: "landscape" 0.0; + inherit: "default" 0.0; + min: 0 44; } } + part { - name: "pv.volume.popup.icon"; - type: IMAGE; - mouse_events: 0; + name: "pv.volume.popup.bottom.padding"; + type: SPACER; scale: 1; description { state: "default" 0.0; - visible : 1; - min: 22 22; + min: 0 32; fixed: 1 1; - align: 0.5 0.0; - rel1 { relative: 0.5 1.0; to_x: "pv.volume.popup.bg"; to_y: "pv.volume.popup.icon.padding";} - rel2 { relative: 0.5 1.0; to_x: "pv.volume.popup.bg"; to_y: "pv.volume.popup.icon.padding";} - color: 255 255 255 255; - image { normal: "popup/T01-2_volume_popup_icon_volume01.png"; } + align: 0.0 1.0; + rel1 { relative: 0.0 1.0; to: "pv.volume.popup.bg";} + rel2 { relative: 1.0 1.0; to: "pv.volume.popup.bg";} } description { - state: "mute" 0.0; + state: "landscape" 0.0; inherit: "default" 0.0; - image { normal: "popup/T01-2_volume_popup_icon_volume02.png"; } + min: 0 32; } } part { - name: "pv.volume.popup.top.padding"; + name: "pv.volume.popup.rect"; type: RECT; mouse_events: 0; scale: 1; description { state: "default" 0.0; visible : 0; - min: 0 11; + min: 32 32; + max: 32 32; fixed: 1 1; - align: 0.0 0.0; - rel1 { relative: 0.0 1.0; to: "pv.volume.popup.icon";} - rel2 { relative: 1.0 1.0; to: "pv.volume.popup.icon";} - color: 255 0 0 255; - + align: 0.5 1.0; + rel1 { relative: 0.5 0.0; to_x: "pv.volume.popup.bg"; to_y: "pv.volume.popup.bottom.padding";} + rel2 { relative: 0.5 0.0; to_x: "pv.volume.popup.bg"; to_y: "pv.volume.popup.bottom.padding";} } } - + part { - name: "pv.volume.popup.bottom.padding"; - type: RECT; + name: "pv.volume.popup.icon"; + type: IMAGE; mouse_events: 0; scale: 1; description { state: "default" 0.0; - visible : 0; - min: 0 18; - fixed: 1 1; - align: 0.0 1.0; - rel1 { relative: 0.0 1.0; to: "pv.volume.popup.bg";} - rel2 { relative: 1.0 1.0; to: "pv.volume.popup.bg";} - color: 255 0 0 255; - + visible : 1; + min: 27 24; + max: 27 24; + align: 0.5 0.5; + rel1 { relative: 0.0 0.0; to: pv.volume.popup.rect;} + rel2 { relative: 1.0 1.0; to: pv.volume.popup.rect;} + image { normal: "popup/T01-2_volume_popup_icon_volume01.png"; } + } + description { + state: "mute" 0.0; + inherit: "default" 0.0; + image { normal: "popup/T01-2_volume_popup_icon_volume02.png"; } } } + part { - name: "pv.volume.popup.txt"; - type: TEXT; + name: "pv.volume.popup.txt.padding"; + type: RECT; mouse_events: 0; scale: 1; - effect: FAR_SHADOW BOTTOM; description { state: "default" 0.0; - visible : 1; - min: 0 23; + visible : 0; + min: 0 12; fixed: 1 1; - align: 0.5 1.0; - rel1 { relative: 0.0 0.0; to: "pv.volume.popup.bottom.padding";} - rel2 { relative: 1.0 0.0; to: "pv.volume.popup.bottom.padding";} - color: FONT_VOLUME_COLOR; - color3: 51 57 72 255; - text { - font: FONT_BOLD_TYPE; - size: 21; - text: "3"; - align: 0.5 0.5; - } - + align: 0.0 1.0; + rel1 { relative: 0.0 0.0; to: "pv.volume.popup.icon";} + rel2 { relative: 1.0 0.0; to: "pv.volume.popup.icon";} + } + description { + state: "landscape" 0.0; + inherit: "default" 0.0; + min: 0 12; } } part { - name: "pv.volume.popup.txt.padding"; + name: "pv.volume.popup.touch.area"; type: RECT; - mouse_events: 0; scale: 1; + mouse_events: 1; description { state: "default" 0.0; - visible : 0; - min: 0 11; - fixed: 0 1; - align: 0.0 1.0; - rel1 { relative: 0.0 0.0; to: "pv.volume.popup.txt";} - rel2 { relative: 1.0 0.0; to: "pv.volume.popup.txt";} - color: 255 0 0 255; - + rel1 { relative: 0.0 0.0; to: "pv.volume.popup.bar.bg"; offset: -10 0; } + rel2 { relative: 1.0 1.0; to: "pv.volume.popup.bar.bg"; offset: 10 0; } + color: 0 0 0 0; } } @@ -190,13 +184,12 @@ collections { description { state: "default" 0.0; visible: 1; - min: 6 0; + min: VOLUME_PROGRESS_WIDTH 0; fixed: 1 0; align: 0.5 0.0; rel1 { relative: 0.5 1.0; to_x : "pv.volume.popup.bg"; to_y : "pv.volume.popup.top.padding";} rel2 { relative: 0.5 0.0; to_x : "pv.volume.popup.bg"; to_y : "pv.volume.popup.txt.padding";} - image { normal: "volume/T01_2_volume_popup_progress_bg.png"; border: 0 0 10 10;} - color: 255 255 255 255; + image { normal: "volume/T01_2_volume_popup_progress_bg.png"; } } } @@ -208,13 +201,12 @@ collections { description { state: "default" 0.0; visible: 1; - min: 6 0; + min: VOLUME_PROGRESS_WIDTH 0; fixed: 1 0; align: 0.0 0.0; - rel1 { relative: 0.0 0.5; to_x : "pv.volume.popup.bar.bg"; to_y: "pv.volume.popup.point";} - rel2 { relative: 1.0 1.0; to : "pv.volume.popup.bar.bg";offset: 0 2;} - color: 255 255 255 255; - image { normal: "volume/T01_2_volume_popup_progress_bar.png"; border: 0 0 10 10;} + rel1 { relative: 0.0 0.5; to_x : "pv.volume.popup.bar.bg"; to_y: "pv.volume.popup.point"; } + rel2 { relative: 1.0 1.0; to : "pv.volume.popup.bar.bg";} + image { normal: "volume/T01_2_volume_popup_progress_bar.png";} } } @@ -223,9 +215,9 @@ collections { scale: 1; mouse_events: 0; description{ state: "default" 0.0; - rel1 { relative: 0.5 0.0; to: "pv.volume.popup.bar.bg";offset: 0 -11; } - rel2 { relative: 0.5 1.0; to: "pv.volume.popup.bar.bg";offset: 0 11;} - min: VOLUME_POPUP_BUTTON_WIDTH 0; + rel1 { relative: 0.5 0.0; to: "pv.volume.popup.bar.bg"; offset: 0 -4;} + rel2 { relative: 0.5 1.0; to: "pv.volume.popup.bar.bg"; offset: 0 +4;} + min: VOLUME_BUTTON_WIDTH 0; fixed: 1 0; align: 0.5 0.0; visible: 0; @@ -238,11 +230,11 @@ collections { repeat_events: 0; description { state: "default" 0.0; - min: VOLUME_POPUP_BUTTON_WIDTH VOLUME_POPUP_BUTTON_HEIGHT; - max: VOLUME_POPUP_BUTTON_WIDTH VOLUME_POPUP_BUTTON_HEIGHT; + min: VOLUME_BUTTON_WIDTH VOLUME_BUTTON_WIDTH; fixed: 1 1; align: 0 0; - color: 0 0 0 0; + color: 255 0 0 100; + visible: 0; } dragable { @@ -260,24 +252,59 @@ collections { description { state: "default" 0.0; visible: 1; - min: VOLUME_POPUP_BUTTON_WIDTH VOLUME_POPUP_BUTTON_HEIGHT; - max: VOLUME_POPUP_BUTTON_WIDTH VOLUME_POPUP_BUTTON_HEIGHT; + min: VOLUME_CIRCLE_W VOLUME_CIRCLE_H; + max: VOLUME_CIRCLE_W VOLUME_CIRCLE_H; fixed: 1 1; align: 0.5 0.5; rel1 { relative: 0.5 0.5; to: "pv.volume.popup.playing";} rel2 { relative: 0.5 0.5; to: "pv.volume.popup.playing";} image { normal: "volume/T01_2_volume_popup_progress_handle.png";} - color: 255 255 255 255; + color: 10 14 74 255; } description { - state: "press" 0.0; - inherit: "default"; + state: "select" 0.0; + inherit: "default" 0.0; + min: VOLUME_CIRCLE_PRESS_W VOLUME_CIRCLE_PRESS_H; + max: VOLUME_CIRCLE_PRESS_W VOLUME_CIRCLE_PRESS_H; image { normal: "volume/T01_2_volume_popup_progress_handle_press.png";} + color: 10 14 74 255; + } + } + + part { + name: "pv.volume.popup.point.focus"; + type: SWALLOW; + mouse_events: 0; + scale: 1; + description { + state: "default" 0.0; + visible: 1; + min: VOLUME_BUTTON_WIDTH VOLUME_BUTTON_HEIGHT; + fixed: 1 1; + rel1 { relative: 0.0 0.0; to: "pv.volume.popup.point"; } + rel2 { relative: 1.0 1.0; to: "pv.volume.popup.point"; } + color: 255 255 255 0; } } } /* parts */ programs { + + program { + name: "volume_select"; + source: "volume.popup.point"; + signal: "volume,select"; + action: STATE_SET "select" 0.0; + target: "pv.volume.popup.point"; + } + program { + name: "volume_unselect"; + source: "volume.popup.point"; + signal: "volume,unselect"; + action: STATE_SET "default" 0.0; + target: "pv.volume.popup.point"; + } + program { name: "set_mute"; signal: "set,mute"; source: "volume.popup.icon"; @@ -290,21 +317,7 @@ collections { action: STATE_SET "default" 0.0; target: "pv.volume.popup.icon"; } - program { - name: "pv.volume.down"; - source: "pv.volume.popup.point"; - signal: "mouse,down,1"; - action: STATE_SET "press" 0.0; - target: "pv.volume.popup.point"; - } - program { - name: "pv.volume.up"; - source: "pv.volume.popup.point"; - signal: "mouse,up,1"; - action: STATE_SET "default" 0.0; - target: "pv.volume.popup.point"; - } - } /* programs */ + } /* programs */ } /* group */ } /* collections */ diff --git a/vp-main/res/edje/pv-volume.edc b/vp-main/res/edje/pv-volume.edc index 9d9be06..f0d8727 100755 --- a/vp-main/res/edje/pv-volume.edc +++ b/vp-main/res/edje/pv-volume.edc @@ -14,26 +14,31 @@ * limitations under the License. */ #include "pv-image.edc" +#include "custom/pv-custom-define.edc" -#define FONT_BOLD_TYPE "Tizen:style=Bold" +#define FONT_BOLD_TYPE "Tizen:style=Bold" -#define FONT_VOLUME_COLOR 255 255 255 255 +#define FONT_VOLUME_COLOR 255 255 255 255 -#define VOLUME_WIDGET_WIDTH 72 -#define VOLUME_WIDGET_PORTRAIT_HEIGHT 486 -#define VOLUME_WIDGET_LANDSCAPE_HEIGHT 264 +#define VOLUME_WIDGET_WIDTH 82 +#define VOLUME_WIDGET_PORTRAIT_HEIGHT 482 +#define VOLUME_WIDGET_LANDSCAPE_HEIGHT 482 -#define VOLUME_BUTTON_HEIGHT 40 -#define VOLUME_BUTTON_WIDTH 25 -#define VOLUME_PROGRESS_WIDTH 15 +#define VOLUME_BUTTON_HEIGHT 32 +#define VOLUME_BUTTON_WIDTH 32 +#define VOLUME_CIRCLE_H 24 +#define VOLUME_CIRCLE_W 24 +#define VOLUME_CIRCLE_PRESS_H 32 +#define VOLUME_CIRCLE_PRESS_W 32 +#define VOLUME_PROGRESS_WIDTH 4 externals { - external: "elm"; - external: "feedback"; + external: "elm"; + external: "feedback"; } collections { - base_scale : 2.6; + base_scale : CURRENT_BASE_SCALE; plugins { plugin { name: "touch_sound_plugin"; @@ -53,13 +58,13 @@ collections { description { state: "default" 0.0; visible : 1; - min: VOLUME_WIDGET_WIDTH VOLUME_WIDGET_PORTRAIT_HEIGHT; - max: VOLUME_WIDGET_WIDTH VOLUME_WIDGET_PORTRAIT_HEIGHT; + min: VOLUME_WIDGET_WIDTH VOLUME_WIDGET_LANDSCAPE_HEIGHT; + max: VOLUME_WIDGET_WIDTH VOLUME_WIDGET_LANDSCAPE_HEIGHT; fixed: 1 1; - align: 0.2 0.0; - rel1 { relative: 0.5 0.5;} - rel2 { relative: 0.5 0.5;} - image { normal: "volume/T01_2_volume_popup_bg.png"; border: 0 0 15 15; } + align: 0.0 0.0; + rel1 { relative: 0.0 0.0;} + rel2 { relative: 0.0 0.0;} + image { normal: "volume/T01_2_volume_popup_bg.png"; } } description { @@ -67,7 +72,7 @@ collections { inherit: "default" 0.0; min: VOLUME_WIDGET_WIDTH VOLUME_WIDGET_LANDSCAPE_HEIGHT; max: VOLUME_WIDGET_WIDTH VOLUME_WIDGET_LANDSCAPE_HEIGHT; - image { normal: "volume/T01_2_volume_popup_bg.png"; border: 0 0 15 15; } + image { normal: "volume/T01_2_volume_popup_bg.png"; } } } @@ -77,7 +82,7 @@ collections { scale: 1; description { state: "default" 0.0; - min: 0 32; + min: 0 44; fixed: 1 1; align: 0.0 0.0; rel1 { relative: 0.0 0.0; to: "pv.volume.bg";} @@ -86,7 +91,7 @@ collections { description { state: "landscape" 0.0; inherit: "default" 0.0; - min: 0 16; + min: 0 44; } } @@ -96,7 +101,7 @@ collections { scale: 1; description { state: "default" 0.0; - min: 0 21; + min: 0 32; fixed: 1 1; align: 0.0 1.0; rel1 { relative: 0.0 1.0; to: "pv.volume.bg";} @@ -105,31 +110,50 @@ collections { description { state: "landscape" 0.0; inherit: "default" 0.0; - min: 0 12; + min: 0 32; } } part { - name: "pv.volume.txt"; - type: TEXT; + name: "pv.volume.icon.rect"; + type: RECT; mouse_events: 0; scale: 1; - effect: FAR_SHADOW BOTTOM; description { state: "default" 0.0; - visible : 1; - min: 0 16; + visible : 0; + min: 32 32; + max: 32 32; fixed: 1 1; align: 0.5 1.0; - rel1 { relative: 0.0 0.0; to: "pv.volume.bottom.padding";} - rel2 { relative: 1.0 0.0; to: "pv.volume.bottom.padding";} - text { - size: 38; - } + rel1 { relative: 0.5 0.0; to_x: "pv.volume.bg"; to_y: "pv.volume.bottom.padding";} + rel2 { relative: 0.5 0.0; to_x: "pv.volume.bg"; to_y: "pv.volume.bottom.padding";} + } + } + part { + name: "pv.volume.icon"; + type: IMAGE; + mouse_events: 0; + scale: 1; + description { + state: "default" 0.0; + visible : 1; + min: 27 24; + max: 27 24; + align: 0.5 0.5; + rel1 { relative: 0.0 0.0; to: pv.volume.icon.rect;} + rel2 { relative: 1.0 1.0; to: pv.volume.icon.rect;} + image { normal: "popup/T01-2_volume_popup_icon_volume01.png"; } + } + description { + state: "mute" 0.0; + inherit: "default" 0.0; + image { normal: "popup/T01-2_volume_popup_icon_volume02.png"; } } } + part { name: "pv.volume.txt.padding"; type: RECT; @@ -138,16 +162,16 @@ collections { description { state: "default" 0.0; visible : 0; - min: 0 21; + min: 0 12; fixed: 1 1; align: 0.0 1.0; - rel1 { relative: 0.0 0.0; to: "pv.volume.txt";} - rel2 { relative: 1.0 0.0; to: "pv.volume.txt";} + rel1 { relative: 0.0 0.0; to: "pv.volume.icon";} + rel2 { relative: 1.0 0.0; to: "pv.volume.icon";} } description { state: "landscape" 0.0; inherit: "default" 0.0; - min: 0 20; + min: 0 12; } } @@ -177,7 +201,7 @@ collections { align: 0.5 0.0; rel1 { relative: 0.5 1.0; to_x : "pv.volume.bg"; to_y : "pv.volume.top.padding";} rel2 { relative: 0.5 0.0; to_x : "pv.volume.bg"; to_y : "pv.volume.txt.padding";} - image { normal: "volume/T01_2_volume_popup_progress_bg.png"; border: 0 0 5 5;} + image { normal: "volume/T01_2_volume_popup_progress_bg.png"; } } } @@ -193,8 +217,8 @@ collections { fixed: 1 0; align: 0.0 0.0; rel1 { relative: 0.0 0.5; to_x : "pv.volume.bar.bg"; to_y: "pv.volume.point"; } - rel2 { relative: 1.0 1.0; to : "pv.volume.bar.bg"; offset: 0 1;} - image { normal: "volume/T01_2_volume_popup_progress_bar.png"; border: 0 0 5 5;} + rel2 { relative: 1.0 1.0; to : "pv.volume.bar.bg";} + image { normal: "volume/T01_2_volume_popup_progress_bar.png";} } } @@ -203,8 +227,8 @@ collections { scale: 1; mouse_events: 0; description{ state: "default" 0.0; - rel1 { relative: 0.5 0.0; to: "pv.volume.bar.bg"; offset: 0 -7; } - rel2 { relative: 0.5 1.0; to: "pv.volume.bar.bg"; offset: 0 7;} + rel1 { relative: 0.5 0.0; to: "pv.volume.bar.bg"; offset: 0 -4;} + rel2 { relative: 0.5 1.0; to: "pv.volume.bar.bg"; offset: 0 +4;} min: VOLUME_BUTTON_WIDTH 0; fixed: 1 0; align: 0.5 0.0; @@ -219,7 +243,6 @@ collections { description { state: "default" 0.0; min: VOLUME_BUTTON_WIDTH VOLUME_BUTTON_HEIGHT; - max: VOLUME_BUTTON_WIDTH VOLUME_BUTTON_HEIGHT; fixed: 1 1; align: 0 0; color: 0 0 0 0; @@ -240,19 +263,22 @@ collections { description { state: "default" 0.0; visible: 1; - min: VOLUME_BUTTON_WIDTH VOLUME_BUTTON_HEIGHT; - max: VOLUME_BUTTON_WIDTH VOLUME_BUTTON_HEIGHT; + min: VOLUME_CIRCLE_W VOLUME_CIRCLE_H; + max: VOLUME_CIRCLE_W VOLUME_CIRCLE_H; fixed: 1 1; align: 0.5 0.5; rel1 { relative: 0.5 0.5; to: "pv.volume.playing";} rel2 { relative: 0.5 0.5; to: "pv.volume.playing";} image { normal: "volume/T01_2_volume_popup_progress_handle.png";} - color: 255 255 255 255; + color: 10 14 74 255; } description { state: "press" 0.0; inherit: "default"; + min: VOLUME_CIRCLE_PRESS_W VOLUME_CIRCLE_PRESS_H; + max: VOLUME_CIRCLE_PRESS_W VOLUME_CIRCLE_PRESS_H; image { normal: "volume/T01_2_volume_popup_progress_handle_press.png";} + color: 10 14 74 255; } } @@ -283,6 +309,7 @@ collections { target: "pv.volume.top.padding"; target: "pv.volume.bottom.padding"; target: "pv.volume.txt.padding"; + target: "pv.volume.icon.rect"; } program { @@ -294,7 +321,22 @@ collections { target: "pv.volume.top.padding"; target: "pv.volume.bottom.padding"; target: "pv.volume.txt.padding"; + target: "pv.volume.icon.rect"; + } + + program { name: "set_mute"; + signal: "set,mute"; + source: "volume.popup.icon"; + action: STATE_SET "mute" 0.0; + target: "pv.volume.icon"; + } + program { name: "set_volume"; + signal: "set,volume"; + source: "volume.popup.icon"; + action: STATE_SET "default" 0.0; + target: "pv.volume.icon"; } + program { name: "pv.volume.down"; source: "pv.volume.point";