Merge "viewer: add zoom button" into tizensubmit/tizen/20150902.051532accepted/tizen/tv/20150902.055614

6 files changed, 69 insertions, 1 deletions

diff --git a/include/view/viewer.h b/include/view/viewer.h
index 2674ae8..559402b 100644
--- a/include/view/viewer.h
+++ b/include/view/viewer.h
@@ -58,6 +58,7 @@
 #define SRC_BTN_GALLERY_PREV "prev_gallery"
 #define SRC_BTN_GALLERY_NEXT "next_gallery"
 #define SRC_BTN_ROTATE "rotate"
+#define SRC_BTN_ZOOM "zoom"
 
 /* images */
 #define IMAGE_VIEWER_FAVORITE "ic_title_favorite.png"
@@ -79,5 +80,7 @@
 #define IMAGE_VIEWER_PHOTO_NEXT_NORMAL "btn_view_slide_next_nor.png"
 #define IMAGE_VIEWER_ROTATE_FOCUS "btn_view_contr_rotate_foc.png"
 #define IMAGE_VIEWER_ROTATE_NORMAL "btn_view_contr_rotate_nor.png"
+#define IMAGE_VIEWER_ZOOM_FOCUS "btn_view_contr_zoom_foc.png"
+#define IMAGE_VIEWER_ZOOM_NORMAL "btn_view_contr_zoom_nor.png"
 
 #endif /* __AIR_MEDIAHUB_VIEW_VIEWER_H__ */
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
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
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 {
diff --git a/src/view/viewer.c b/src/view/viewer.c
index 29f3a7f..ca82aad 100644
--- a/src/view/viewer.c
+++ b/src/view/viewer.c
@@ -47,6 +47,7 @@
 #define BTN_LOC_PLAY 2
 #define BTN_LOC_NEXT 4
 #define BTN_LOC_ROTATE 5
+#define BTN_LOC_ZOOM 6
 
 enum {
 	VIEWER_MOVIE,
@@ -114,6 +115,10 @@ static struct _btn_info btn_photo[] = {
 		.name = SRC_BTN_ROTATE,
 		.loc = BTN_LOC_ROTATE,
 	},
+	{
+		.name = SRC_BTN_ZOOM,
+		.loc = BTN_LOC_ZOOM,
+	},
 };
 
 static struct _btn_info btn_video[] = {
@@ -154,7 +159,7 @@ static struct _viewer_info viewer_info[] = {
 	},
 	{
 		.btns = btn_photo,
-		.btn_count = 3,
+		.btn_count = 4,
 		.focus_loc = BTN_LOC_NEXT,
 		.callback = _callback_photo,
 	},