From 20bfce85992a128dd2b04eeef6ec36b8b8c7456a Mon Sep 17 00:00:00 2001
From: Jin Yoon <jinny.yoon@samsung.com>
Date: Tue, 15 Jan 2013 19:25:17 +0900
Subject: [PATCH] EFL Requests : font, style

Change-Id: I8dd9bc781953686831da8d57b8a1703ff2db03fb
---
 data/edje/index.edc    | 8 ++++----
 data/edje/item_4x4.edc | 6 +++---
 src/item.c             | 2 +-
 src/menu_screen.c      | 1 +
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/data/edje/index.edc b/data/edje/index.edc
index 3986358..e0fed76 100644
--- a/data/edje/index.edc
+++ b/data/edje/index.edc
@@ -14,10 +14,10 @@
   * limitations under the License.
   */
 
-#define INDEX_PAGECONTROL_IND_INC 35 35 
-#define INDEX_PAGECONTROL_IND_MIN_INC 35 35 
+#define INDEX_PAGECONTROL_IND_INC 35 35
+#define INDEX_PAGECONTROL_IND_MIN_INC 35 35
 #define INDEX_PAGECONTROL_FONT_COLOR_INC 255 255 255
-#define INDEX_PAGECONTROL_FONT_SIZE_INC 18 
+#define INDEX_PAGECONTROL_FONT_SIZE_INC 18
 
 collections {
    group {
@@ -140,7 +140,7 @@ collections {
                color: INDEX_PAGECONTROL_FONT_COLOR_INC 0;
                align: 0.5 0.5;
                text {
-                  font: "SLP:style=Bold";
+                  font: "TIZEN:style=Bold";
                   size: INDEX_PAGECONTROL_FONT_SIZE_INC;
                   min: 0 1;
                   //FIXME:values should be 0.5 0.5 when fonts are aligned correctly.
diff --git a/data/edje/item_4x4.edc b/data/edje/item_4x4.edc
index 03f1e05..2b890e7 100644
--- a/data/edje/item_4x4.edc
+++ b/data/edje/item_4x4.edc
@@ -19,7 +19,7 @@
 styles {
 	style {
 		name: "app_name_style";
-		base: "font=SLP:style=MEDIUM font_size=27 align=center valign=top color=#FFFFFF style=soft_shadow shadow_color=#00000060 ellipsis=1";
+		base: "font=TIZEN:style=MEDIUM font_size=27 align=center valign=top color=#FFFFFF style=soft_shadow shadow_color=#00000060 ellipsis=1";
 
 		tag: "br" "\n";
 	}
@@ -121,7 +121,7 @@ collections {
 					text {
 						//style: "app_name_style";
 						text_class: "menu_item";
-						font: "SLP:style=medium";
+						font: "TIZEN:style=medium";
 						size: 16;
 						text: "Icon";
 						align: 0.5 0.1;
@@ -136,7 +136,7 @@ collections {
 				}
 			}
 		}
-		
+
 		programs {
 			program {
 				name: "item,down";
diff --git a/src/item.c b/src/item.c
index 1d799f9..aeb1812 100644
--- a/src/item.c
+++ b/src/item.c
@@ -518,7 +518,7 @@ Evas_Object *item_create(Evas_Object *scroller, app_info_t* ai)
 	evas_object_size_hint_max_set(bg, item_width, item_height);
 	elm_object_part_content_set(item, "bg", bg);
 
-	edje_object_text_class_set(_EDJ(item), "menu_item", "SLP:style=medium", 24);
+	edje_object_text_class_set(_EDJ(item), "menu_item", "TIZEN:style=medium", 24);
 
 	evas_object_data_set(item, "win", evas_object_data_get(scroller, "win"));
 	evas_object_data_set(item, "layout", evas_object_data_get(scroller, "layout"));
diff --git a/src/menu_screen.c b/src/menu_screen.c
index acd6650..2b4d91b 100644
--- a/src/menu_screen.c
+++ b/src/menu_screen.c
@@ -305,6 +305,7 @@ Evas_Object *_create_conformant(Evas_Object *win)
 	conformant = elm_conformant_add(win);
 	retv_if(NULL == conformant, NULL);
 
+	elm_object_style_set(conformant, "nokeypad");
 	evas_object_size_hint_weight_set(conformant, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
 	evas_object_data_set(conformant, "win", win);
 	evas_object_show(conformant);
-- 
2.34.1