From 3e8090e78eb18f48be4d9215a1c578f215973165 Mon Sep 17 00:00:00 2001
From: Radek Kintop <r.kintop@samsung.com>
Date: Thu, 9 Mar 2017 18:08:01 +0100
Subject: [PATCH] Picture menu unlocked

Change-Id: I77d5e58940bd455d83b9c981fad4886111f87fe2
Signed-off-by: Radek Kintop <r.kintop@samsung.com>
---
 include/layout.h            |  5 ++---
 res/layout/system.edc       |  4 ++--
 src/common/menumgr.c        |  2 +-
 src/layout/layout_picture.c | 14 ++++++--------
 src/view/view_base.c        |  6 +++---
 5 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/include/layout.h b/include/layout.h
index 7fe619e..10cf80d 100644
--- a/include/layout.h
+++ b/include/layout.h
@@ -23,7 +23,7 @@
 * @brief Available layout types.
 */
 /*release changes:*/
-#define LAYOUT_MAX 2
+#define LAYOUT_MAX 3
 
 enum layout_type {
 	LAYOUT_PICTURE = 0,
@@ -42,9 +42,8 @@ enum layout_type {
 *
 * @return The pointer to picture layout_class object.
 */
-/* TODO: needed in temporary disabled component
 layout_class *layout_picture_get_lclass(void);
-*/
+
 
 /**
 * @brief Get the pointer to the layout_class object of sound layout.
diff --git a/res/layout/system.edc b/res/layout/system.edc
index 318f562..b425495 100644
--- a/res/layout/system.edc
+++ b/res/layout/system.edc
@@ -40,7 +40,7 @@ group {
 				}
 				rel2 {
 					to, "area";
-					relative, 0.25 0.0;
+					relative, 0.0 0.0;
 				}
 				align, 0.0 0.0;
 				fixed, 1 1;
@@ -55,7 +55,7 @@ group {
 				min, 65 148;
 				rel1 {
 					to, "area";
-					relative, 0.75 1.0;
+					relative, 1.0 1.0;
 				}
 				rel2 {
 					to, "area";
diff --git a/src/common/menumgr.c b/src/common/menumgr.c
index 93088a9..b680530 100755
--- a/src/common/menumgr.c
+++ b/src/common/menumgr.c
@@ -27,7 +27,7 @@
 #include "common/menumgr.h"
 
 #define MAX_BTN 8
-#define MAX_BTN_COL 2
+#define MAX_BTN_COL 4
 
 #define STATUS_DEFAULT "N/A"
 
diff --git a/src/layout/layout_picture.c b/src/layout/layout_picture.c
index dfd94ca..a990fd9 100644
--- a/src/layout/layout_picture.c
+++ b/src/layout/layout_picture.c
@@ -68,7 +68,7 @@ static void _destroy(void *layout_data);
 static void _update(void *layout_data, int update_type, void *data);
 
 static struct menumgr_info menu_info[] = {
-	{
+/*	{
 		.id = MENU_PICTURE_MODE,
 		.title = STR_PICTURE_MODE,
 		.style = STYLE_STATUS_BTN,
@@ -80,7 +80,7 @@ static struct menumgr_info menu_info[] = {
 		.focused = _focused,
 		.selected_menu = _selected_menu,
 		.update_cb = settings_picture_set_picture_mode_update_callbacks
-	},
+	},*/
 	{
 		.id = MENU_CONTRAST,
 		.title = STR_CONTRAST,
@@ -107,7 +107,7 @@ static struct menumgr_info menu_info[] = {
 		.selected_menu = _selected_menu,
 		.update_cb = settings_picture_set_brightness_update_callbacks
 	},
-	{
+/*	{
 		.id = MENU_SHARPNESS,
 		.title = STR_SHARPNESS,
 		.style = STYLE_PROGRESS_BTN,
@@ -119,7 +119,7 @@ static struct menumgr_info menu_info[] = {
 		.focused = _focused,
 		.selected_menu = _selected_menu,
 		.update_cb = settings_picture_set_sharpness_update_callbacks
-	},
+	},*/
 	{
 		.id = MENU_COLOR,
 		.title = STR_COLOR,
@@ -146,7 +146,7 @@ static struct menumgr_info menu_info[] = {
 		.selected_menu = _selected_menu,
 		.update_cb = settings_picture_set_tint_update_callbacks
 	},
-	{
+/*	{
 		.id = MENU_SCREEN_ADJ,
 		.title = STR_SCR_ADJ,
 		.style = STYLE_STATUS_BTN,
@@ -158,7 +158,7 @@ static struct menumgr_info menu_info[] = {
 		.focused = _focused,
 		.selected_menu = _selected_menu,
 		.update_cb = settings_picture_set_screen_adj_update_callbacks
-	},
+	},*/
 };
 
 static layout_class _lclass = {
@@ -170,13 +170,11 @@ static layout_class _lclass = {
 	.update = _update
 };
 
-/* TODO: needed in temporary disabled component
 layout_class *layout_picture_get_lclass(void)
 {
 	SETTING_TRACE_BEGIN;
 	return &_lclass;
 }
-*/
 
 static char *_get_picture_mode(void *data, int id)
 {
diff --git a/src/view/view_base.c b/src/view/view_base.c
index 82a1c5e..11b9bfb 100755
--- a/src/view/view_base.c
+++ b/src/view/view_base.c
@@ -48,12 +48,12 @@ struct _menu_data {
 };
 
 static struct _menu_data _mdata[LAYOUT_MAX] = {
-/*	{
+	{
 		.name = STR_PICTURE,
 		.layout_id = LAYOUT_ID_PICTURE,
 		.get_lclass = layout_picture_get_lclass,
 		.enable = EINA_TRUE
-	},
+	},/*
 	{
 		.name = STR_SOUND,
 		.layout_id = LAYOUT_ID_SOUND,
@@ -99,7 +99,7 @@ static struct _menu_data _mdata[LAYOUT_MAX] = {
 };
 
 static struct _menu_data *_mdata_p[LAYOUT_MAX] = {
-	&_mdata[0], &_mdata[1]/*, &_mdata[2], &_mdata[3],
+	&_mdata[0], &_mdata[1], &_mdata[2],/* &_mdata[3],
 	&_mdata[4], &_mdata[5], &_mdata[6], &_mdata[7] */
 };
 
-- 
2.7.4