summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorMinkyu Kang <mk7.kang@samsung.com>2015-09-01 05:00:27 -0700
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>2015-09-01 05:00:27 -0700
commit44fbed6475c2576f0ee745521c249a22987fad7f (patch)
tree59cec14497da37a37726528c0dde254ad77ecfbe /res
parent38f65f0ad62960892a2abc98ccbbf0eeafca1a25 (diff)
parent66df2042e5d1d21c38fecc109c8773eb559a7367 (diff)
downloadair_mediahub-44fbed6475c2576f0ee745521c249a22987fad7f.tar.gz
air_mediahub-44fbed6475c2576f0ee745521c249a22987fad7f.tar.bz2
air_mediahub-44fbed6475c2576f0ee745521c249a22987fad7f.zip
Merge "viewer: add zoom button" into tizensubmit/tizen/20150902.051532accepted/tizen/tv/20150902.055614
Diffstat (limited to 'res')
-rw-r--r--res/edc/images/btn_view_contr_zoom_foc.pngbin0 -> 1872 bytes
-rw-r--r--res/edc/images/btn_view_contr_zoom_nor.pngbin0 -> 2022 bytes
-rw-r--r--res/edc/view/viewer.edc20
-rw-r--r--res/edc/widgets/button.edc40
4 files changed, 60 insertions, 0 deletions
diff --git a/res/edc/images/btn_view_contr_zoom_foc.png b/res/edc/images/btn_view_contr_zoom_foc.png
new file mode 100644
index 0000000..da45740
--- /dev/null
+++ b/res/edc/images/btn_view_contr_zoom_foc.png
Binary files differ
diff --git a/res/edc/images/btn_view_contr_zoom_nor.png b/res/edc/images/btn_view_contr_zoom_nor.png
new file mode 100644
index 0000000..e5d69d4
--- /dev/null
+++ b/res/edc/images/btn_view_contr_zoom_nor.png
Binary files differ
diff --git a/res/edc/view/viewer.edc b/res/edc/view/viewer.edc
index 94f7b1e..29dd7a6 100644
--- a/res/edc/view/viewer.edc
+++ b/res/edc/view/viewer.edc
@@ -405,6 +405,26 @@ group {
}
}
part {
+ name: "control_btn6";
+ type: SWALLOW;
+ clip_to: "bottomarea";
+ scale: 1;
+ description {
+ state: "default" 0.0;
+ min: 114 143;
+ rel1 {
+ to: "control_btn5";
+ relative: 1.0 0.5;
+ }
+ rel2 {
+ to: "control_btn5";
+ relative: 1.0 0.5;
+ }
+ fixed: 1 1;
+ align: 0.0 0.5;
+ }
+ }
+ part {
name: "padding_time";
type: SPACER;
scale: 1;
diff --git a/res/edc/widgets/button.edc b/res/edc/widgets/button.edc
index 197a689..c796b32 100644
--- a/res/edc/widgets/button.edc
+++ b/res/edc/widgets/button.edc
@@ -1005,6 +1005,46 @@ group {
}
group {
+ name: "elm/button/base/viewer_btn_zoom";
+ inherit: "elm/button/base/viewer_btn_rotate";
+ images {
+ image: IMAGE_VIEWER_ZOOM_NORMAL COMP;
+ image: IMAGE_VIEWER_ZOOM_FOCUS COMP;
+ }
+ parts {
+ part {
+ name: "bg";
+ scale: 1;
+ description {
+ state: "default" 0.0;
+ image {
+ normal: IMAGE_VIEWER_ZOOM_NORMAL;
+ }
+ }
+ description {
+ state: "selected" 0.0;
+ inherit: "default" 0.0;
+ image {
+ normal: IMAGE_VIEWER_ZOOM_FOCUS;
+ }
+ }
+ description {
+ state: "clicked" 0.0;
+ image {
+ normal: IMAGE_VIEWER_ZOOM_FOCUS;
+ }
+ }
+ }
+ }
+ programs {
+ program {
+ name: "emit,signal";
+ action: SIGNAL_EMIT SIG_BTN_CALLBACK SRC_BTN_ZOOM;
+ }
+ }
+}
+
+group {
name: "elm/button/base/music_btn_prev";
inherit: "elm/button/base/viewer_btn_prev";
images {