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;
inherit: "default" 0.0;
}
}
+
part {
name: "elm.text";
type: TEXT;
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";}
}
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;
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"; }
visible: 1;
}
}
+
part {
name: "elm.text";
type: TEXT;
* 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 {
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;}
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;}
}
}
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";}
}
}
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;
}
}
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"; }
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"; }
}
}
-
part {
name: "pv.brightness.popup.step";
type: IMAGE;
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;
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;
}
}
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;
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 {
}
}
-
part {
name: "pv.brightness.popup.point";
type: IMAGE;
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 */
* 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;
}
}
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"; }
}
}
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";}
}
}
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;
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 {
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";
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 */
* 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";
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 {
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"; }
}
}
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";}
description {
state: "landscape" 0.0;
inherit: "default" 0.0;
- min: 0 16;
+ min: 0 44;
}
}
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";}
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;
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;
}
}
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"; }
}
}
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";}
}
}
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;
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;
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;
}
}
target: "pv.volume.top.padding";
target: "pv.volume.bottom.padding";
target: "pv.volume.txt.padding";
+ target: "pv.volume.icon.rect";
}
program {
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";
#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
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);
}
}
* @param nValueRatio
*/
static void _vp_play_brightness_update_icon(BrightnessWidget *
- pBrightnessWidget,
- double nValueRatio)
+ pBrightnessWidget )
{
if (pBrightnessWidget == NULL) {
VideoLogError("pBrightnessWidget is NULL");
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);
+
}
/**
}
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 /
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);
}
/**
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,
BrightnessWidget *pBrightnessWidget =
(BrightnessWidget *) pBrightnessHandle;
+ elm_object_signal_emit(pBrightnessWidget->pLayout, "brightness,unselect", "brightness.popup.point");
+
pBrightnessWidget->bIsRealize = FALSE;
evas_object_hide(pBrightnessWidget->pLayout);
_vp_play_brightness_set_value(pBrightnessWidget,
pBrightnessWidget->nCurVal);
+
+ elm_object_signal_emit(pBrightnessWidget->pLayout, "brightness,select", "brightness.popup.point");
return TRUE;
}
#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
}
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 /
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",
_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,
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,
pVolumeWidget->bIsRealize = FALSE;
+ elm_object_signal_emit(pVolumeWidget->pLayout, "volume,unselect", "volume.popup.point");
+
evas_object_hide(pVolumeWidget->pLayout);
return TRUE;
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) {
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) {
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");
+ }
+
}
/**
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;
inherit: "default" 0.0;
}
}
-
+
part {
name: "elm.text";
type: TEXT;
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";}
}
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;
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
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"; }
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"; }
parts {
part {
name: "button_image";
- type: RECT;
+ type: RECT;
description {
state: "default" 0.0;
color:0 0 255 255;
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";}
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";}
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";}
visible: 1;
}
}
-
+
part {
name: "elm.text";
type: TEXT;
* 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 {
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;}
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;}
}
}
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";}
}
}
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;
}
}
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"; }
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"; }
}
}
-
part {
name: "pv.brightness.popup.step";
type: IMAGE;
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;
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;
}
}
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;
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 {
}
}
-
part {
name: "pv.brightness.popup.point";
type: IMAGE;
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 */
* 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;
}
}
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"; }
}
}
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";}
}
}
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;
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 {
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";
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 */
* 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";
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 {
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"; }
}
}
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";}
description {
state: "landscape" 0.0;
inherit: "default" 0.0;
- min: 0 16;
+ min: 0 44;
}
}
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";}
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;
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;
}
}
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"; }
}
}
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";}
}
}
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;
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;
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;
}
}
target: "pv.volume.top.padding";
target: "pv.volume.bottom.padding";
target: "pv.volume.txt.padding";
+ target: "pv.volume.icon.rect";
}
program {
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";
projects / profile / iot / apps / native / video-player.git / commitdiff
