Sync with Tizen 3.0 setting mobile (1) 37/69237/1
authorHyunjee Kim <hj0426.kim@samsung.com>
Thu, 12 May 2016 06:20:03 +0000 (15:20 +0900)
committerHyunjee Kim <hj0426.kim@samsung.com>
Thu, 12 May 2016 08:30:49 +0000 (17:30 +0900)
* Fix defect in Region List (Ifabc29a87dfd4a31f8a80c3234e6686f62fb83f0)
* Remove OLD_GENLIST_STYLE macro (I3a2162775ab7e96671b650b7b588b77f619d1248)
* Removed codes to use theme layout not avilable (I871ed61b7c691357840a83533957b55dac86e767)
* Removed unused global variables about genlist item (Ib7880b96e656360808a6b81bed6662aa46f23748)
* Lack of Pie diagram in storage (Ic01a61334e6450b93b6571730a79835f86a31e52)

Change-Id: I2e5ff8885c33eabc175e8964e1471a624ae9e915
Signed-off-by: Hyunjee Kim <hj0426.kim@samsung.com>
15 files changed:
setting-appmgr/include/setting-appmgr-main.h
setting-appmgr/include/setting-appmgr-utils.h
setting-appmgr/src/setting-appmgr-main.c
setting-appmgr/src/setting-appmgr-pkginfo-utils.c
setting-appmgr/src/setting-appmgr-runinfo.c
setting-appmgr/src/setting-appmgr-utils.c
setting-appmgr/src/setting-appmgr.c
setting-common/include/setting-common-data-type.h
setting-common/include/setting-common-draw-widget.h
setting-common/src/setting-common-draw-genlist.c
setting-phone/src/setting-phone-region-format.c
setting-profile/src/setting-profile-common.c
setting-storage/src/setting-storage-main.c
setting-storage/src/setting-storage-utils.c
setting-storage/src/setting-storage.c

index 68b04b65f273d2be3fcf80b61f90d77b14d0e0f7..d1e568822f9439f44ff19d3d50cbca9a8e5b5121 100644 (file)
@@ -23,9 +23,6 @@
 
 void appmgrUg_main_init(SettingAppMgrUG *ad);
 void appmgrUg_main_genlist_append_items(SettingAppMgrUG *ad);
-char *appmgrUg_main_gl_label_get(void *data, Evas_Object *obj, const char *part);
-Evas_Object *appmgrUg_main_gl_icon_get(void *data, Evas_Object *obj,
-                                                                          const char *part);
 
 char *appmgrUg_main_gl_label_new_get(void *data, Evas_Object *obj, const char *part);
 Evas_Object *appmgrUg_main_gl_icon_new_get(void *data, Evas_Object *obj, const char *part);
index facb476aa2a4f6499c5123f01512447451e4683e..57dea23e10c4e388939daf13ac1f5705cb12809e 100644 (file)
@@ -34,8 +34,6 @@ void appmgrUg_get_runlistinfos_cb(int fn_result, SettingAppMgrUG *ad);
 void appmgrUg_pkgmgr_subscribe(SettingAppMgrUG *ad);
 void appmgrUg_pkgmgr_deinit(SettingAppMgrUG *ad);
 void appmgrUg_free_listinfos(SettingAppMgrUG *ad);
-Elm_Object_Item *appmgrUg_append_separator(Evas_Object *genlist,
-                                                                                  SettingAppMgrUG *ad);
 void appmgrUg_size_to_str(int size, char *desc, int desc_size);
 char *appmgrUg_info_title_gl_label_get(void *data, Evas_Object *obj,
                                                                           const char *part);
index 9f4b0bb25ef25c708eb1a6bdddab6349fd168837..97e5817bc3a9a3579b5419f41ab2bfa4bea27137 100644 (file)
@@ -396,28 +396,6 @@ char *appmgrUg_main_gl_label_new_get(void *data, Evas_Object *obj, const char *p
        return label;
 }
 
-char *appmgrUg_main_gl_label_get(void *data, Evas_Object *obj, const char *part)
-{
-       char *label = NULL;
-       appmgr_listinfo *info = data;
-
-       retv_if(data == NULL, NULL);
-
-       if (0 == strcmp(part, "elm.text.main.left.top")) {
-               label = SAFE_STRDUP(info->pkg_label);
-       } else if (0 == strcmp(part, "elm.text.sub.left.bottom")) {
-               char desc[APPMGRUG_MAX_STR_LEN] = {0};
-               if (info->valid_size) {
-                       appmgrUg_size_to_str(info->total_size, desc, sizeof(desc));
-                       label = strdup(desc);
-               } else {
-                       label = strdup(_(MGRAPP_STR_COMPUTING));
-               }
-       }
-
-       return label;
-}
-
 static inline char *appmgrUg_get_listinfo_default_icon(const char *appid)
 {
        int ret;
@@ -440,7 +418,6 @@ Evas_Object *appmgrUg_main_gl_icon_new_get(void *data, Evas_Object *obj, const c
        SETTING_TRACE(" ------------> content get [%s]", part);
 
        Evas_Object *icon = NULL;
-       Evas_Object *lay = NULL;
        appmgr_listinfo *info = data;
 
        retv_if(data == NULL, NULL);
@@ -448,51 +425,19 @@ Evas_Object *appmgrUg_main_gl_icon_new_get(void *data, Evas_Object *obj, const c
        if (!safeStrCmp(part, "elm.swallow.icon")) {
                icon = elm_icon_add(obj);
 
-               if (NULL == info->icon_path)
-                       info->icon_path = appmgrUg_get_listinfo_default_icon(info->mainappid);
-
-               elm_image_file_set(icon, info->icon_path, NULL);
-               evas_object_size_hint_weight_set(icon, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-               evas_object_size_hint_align_set(icon, EVAS_HINT_FILL, EVAS_HINT_FILL);
-
-               lay = elm_layout_add(obj);
-               retv_if(lay == NULL, NULL);
-               elm_layout_theme_set(lay, "layout", "list/B/type.2", "default");
-               elm_layout_content_set(lay, "elm.swallow.content", icon);
-
-               return lay;
-       } else {
-               return NULL;
-       }
-}
-
-
-
-Evas_Object *appmgrUg_main_gl_icon_get(void *data, Evas_Object *obj,
-                                                                          const char *part)
-{
-       Evas_Object *icon = NULL;
-       Evas_Object *lay = NULL;
-       appmgr_listinfo *info = data;
-
-       retv_if(data == NULL, NULL);
-
-       if (!safeStrCmp(part, "elm.icon.1")) {
-               icon = elm_icon_add(obj);
+               SETTING_TRACE(" -------> info->icon_path : %s", info->icon_path);
 
                if (NULL == info->icon_path)
                        info->icon_path = appmgrUg_get_listinfo_default_icon(info->mainappid);
 
                elm_image_file_set(icon, info->icon_path, NULL);
+               elm_image_resizable_set(icon, EINA_TRUE, EINA_TRUE);
+
                evas_object_size_hint_weight_set(icon, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
                evas_object_size_hint_align_set(icon, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
-               lay = elm_layout_add(obj);
-               retv_if(lay == NULL, NULL);
-               elm_layout_theme_set(lay, "layout", "list/B/type.2", "default");
-               elm_layout_content_set(lay, "elm.swallow.content", icon);
-
-               return lay;
+               evas_object_show(icon);
+               return icon;
        } else {
                return NULL;
        }
index 8a9bfcfc853e68762f08a37dcbeeab67b87e0296..0d79907ce3cb099e268bd1a58fd833703d39b2b3 100644 (file)
@@ -65,7 +65,6 @@ static UNUSED int appmgrUg_pkg_get_privileges_help(const char *privilege,
        free(help);
        free(name);
 
-       appmgrUg_append_separator(info->gl_prv, ad);
        setting_create_Gendial_field_titleItem(info->gl_prv, &ad->itc_multiline, desc, NULL);
 
        g_free(desc);
index 6ebb66bf6c33113dc6f7d597da83d8e277265242..f2ea0d0bf2f5c2d1c9b0c353ca8a6fad184b7355 100644 (file)
@@ -323,8 +323,6 @@ Evas_Object *appmgrUg_run_gl_stop_btn(void *data, Evas_Object *obj,
        SettingAppMgrUG *ad = data;
 
        retv_if(NULL == data, NULL);
-       if (0 != safeStrCmp(part, "elm.icon"))
-               return NULL;
 
        Evas_Object *box = elm_box_add(obj);
        elm_box_horizontal_set(box, 1);
index 01e5a25fac51c2ef0aba5eee5a971a1cd3f7ea94..7389d3dbf7754411e1b93d0fe4f7eb11b9bf7663 100644 (file)
@@ -244,17 +244,6 @@ Evas_Object *appmgrUg_loading_item(Evas_Object *parent, const char *text,
        return layout;
 }
 
-Elm_Object_Item *appmgrUg_append_separator(Evas_Object *genlist,
-                                                                                  SettingAppMgrUG *ad)
-{
-       Elm_Object_Item *item = NULL;
-
-       item = elm_genlist_item_append(genlist, &ad->itc_sep, NULL, NULL,
-                                                                  ELM_GENLIST_ITEM_NONE, NULL, NULL);
-       elm_genlist_item_select_mode_set(item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
-       return item;
-}
-
 char *appmgrUg_get_defualt_icon(pkgmgrinfo_appinfo_h handle)
 {
        int ret;
@@ -666,13 +655,8 @@ Evas_Object *appmgrUg_info_title_gl_icon_get(void *data, Evas_Object *obj,
        evas_object_size_hint_weight_set(icon, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        evas_object_size_hint_align_set(icon, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
-       lay = elm_layout_add(obj);
-       elm_layout_theme_set(lay, "layout", "list/B/type.2", "default");
-       elm_layout_content_set(lay, "elm.swallow.content", icon);
-
        evas_object_show(icon);
-
-       return lay;
+       return icon;
 }
 
 void appmgrUg_pkg_disable_enable_cb(void *data, Evas_Object *obj,
index db30056f9d2af2b1ff4ac14ee97a6e7c49474923..d8244851041bf7e6ca594d02f4dc7e1d22bbc6eb 100644 (file)
@@ -71,25 +71,11 @@ static inline void appmgrUg_init_itcs(SettingAppMgrUG *ad)
        setting_create_Gendial_itc(SETTING_GENLIST_ICON_1LINE_STYLE, &(ad->itc_1txt));
        setting_create_Gendial_itc("multiline_sub.main", &(ad->itc_multiline_2txt));
 
-       ad->itc_sep.item_style = "dialogue/separator.transparent.2";
-       ad->itc_sep.func.text_get = NULL;
-       ad->itc_sep.func.content_get = NULL;
-       ad->itc_sep.func.state_get = NULL;
-       ad->itc_sep.func.del = NULL;
-
-#if OLD_GENLIST_STYLE
-       ad->itc_main.item_style = SETTING_GENLIST_2LINE_STYLE;
-       ad->itc_main.func.text_get = appmgrUg_main_gl_label_get;
-       ad->itc_main.func.content_get = appmgrUg_main_gl_icon_get;
-       ad->itc_main.func.state_get = NULL;
-       ad->itc_main.func.del = _main_gl_del_cb;
-#else
        ad->itc_main.item_style = SETTING_GENLIST_2LINE_STYLE;
        ad->itc_main.func.text_get = appmgrUg_main_gl_label_new_get;
        ad->itc_main.func.content_get = appmgrUg_main_gl_icon_new_get;
        ad->itc_main.func.state_get = NULL;
        ad->itc_main.func.del = _main_gl_del_cb;
-#endif
 
        ad->itc_1ic.item_style = "1icon";
        ad->itc_1ic.func.text_get = NULL;
@@ -97,19 +83,11 @@ static inline void appmgrUg_init_itcs(SettingAppMgrUG *ad)
        ad->itc_1ic.func.state_get = NULL;
        ad->itc_1ic.func.del = NULL;
 
-#if OLD_GENLIST_STYLE
        ad->itc_info_title.item_style = SETTING_GENLIST_2LINE_STYLE;
        ad->itc_info_title.func.text_get = appmgrUg_info_title_gl_label_get;
        ad->itc_info_title.func.content_get = appmgrUg_info_title_gl_icon_get;
        ad->itc_info_title.func.state_get = NULL;
        ad->itc_info_title.func.del = NULL;
-#else
-       ad->itc_info_title.item_style = SETTING_GENLIST_2LINE_STYLE;
-       ad->itc_info_title.func.text_get = appmgrUg_info_title_gl_label_get;
-       ad->itc_info_title.func.content_get = appmgrUg_info_title_gl_icon_get;
-       ad->itc_info_title.func.state_get = NULL;
-       ad->itc_info_title.func.del = NULL;
-#endif
 
        ad->itc_2button1.item_style = "1icon";
        ad->itc_2button1.func.text_get = NULL;
@@ -380,7 +358,7 @@ UG_MODULE_API int setting_plugin_search_init(app_control_h service, void *priv,
        size = sizeof(search_configs) / sizeof(Setting_Cfg_Node_T);
 
        for (i = 0; i < size; i++) {
-               sprintf(ug_args, "keyword:%s", search_configs[i].key_name);
+               snprintf(ug_args, APPMGRUG_MAX_STR_LEN, "keyword:%s", search_configs[i].key_name);
                node = setting_plugin_search_item_subindex_add(
                                   search_configs[i].key_name,
                                   ug_args,
index 3181a55457d516a448f903eb47488f9e6fe2fe0d..dfc5465452a0494f8b6d5902b2e8415f77f1817e 100644 (file)
 #define PWD_FILE       _TZ_SYS_DATA"/setting/set_info"
 
 
-#ifdef OLD_GENLIST_STYLE
-#define SETTING_GENLIST_GROUP_INDEX_STYLE "groupindex"
-#define SETTING_GENLIST_ICON_1LINE_STYLE "1line"
-#define SETTING_GENLIST_2LINE_STYLE "2line.top"
-#define SETTING_GENLIST_MULTILINE_STYLE "multiline_sub"
-#define SETTING_GENLIST_LEFT_ICON_CONTENT_ICON_STYLE "1icon"
-
-#else
 #define SETTING_GENLIST_GROUP_INDEX_STYLE "group_index"
 #define SETTING_GENLIST_ICON_1LINE_STYLE "type1"
 #define SETTING_GENLIST_2LINE_STYLE "type1"
 #define SETTING_GENLIST_MULTILINE_STYLE "multiline"
 #define SETTING_GENLIST_LEFT_ICON_CONTENT_ICON_STYLE "full"
-#endif
 
 
 
index 5ff31d3c22613d5c1201d67ee54b715d35108fe1..ac30850ce51756e99fcccf1a557d176c7e09c645 100644 (file)
@@ -44,8 +44,6 @@
 #define POPUP_INTERVAL 2.0
 
 extern const Elm_Genlist_Item_Class itc_seperator;
-extern const Elm_Genlist_Item_Class itc_bottom_seperator;
-extern const Elm_Genlist_Item_Class itc_sep_line;
 
 extern const Elm_Genlist_Item_Class itc_1text;
 extern const Elm_Genlist_Item_Class itc_1text_1icon_2;
@@ -74,24 +72,16 @@ extern const Elm_Genlist_Item_Class itc_1text_1icon_3_tb;
 extern const Elm_Genlist_Item_Class itc_cm_1text_1icon_2;
 extern const Elm_Genlist_Item_Class itc_bg_1icon;
 extern const Elm_Genlist_Item_Class itc_1icon_with_no_line;
-extern const Elm_Genlist_Item_Class itc_1icon_with_no_padding;
 extern const Elm_Genlist_Item_Class itc_group_item;
 extern const Elm_Genlist_Item_Class itc_multiline_1text_1icon;
-extern const Elm_Genlist_Item_Class itc_1text_2icon_divider;
-extern const Elm_Genlist_Item_Class itc_no_group_1text_1icon_2;
 
 extern const Elm_Genlist_Item_Class itc_editfield;
 extern const Elm_Genlist_Item_Class itc_multiline_2text;
 extern const Elm_Genlist_Item_Class itc_1text_1icon_divider;
-extern const Elm_Genlist_Item_Class itc_normal_1text;
-extern const Elm_Genlist_Item_Class itc_bottom_line;
-
 
 #define ADD_GL_LABLE(scroller, str) \
        {\
                if (str) {\
-                       Elm_Object_Item *item = elm_genlist_item_append(scroller, &(itc_bottom_seperator), NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);\
-                       elm_genlist_item_select_mode_set(item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);\
                        Setting_GenGroupItem_Data *item_data = setting_create_Gendial_field_def(scroller, &itc_multiline_text,\
                                                                                                                                                                        NULL,\
                                                                                                                                                                        NULL,\
@@ -115,20 +105,6 @@ extern const Elm_Genlist_Item_Class itc_bottom_line;
                } \
        }
 
-#ifdef OLD_GENLIST_STYLE
-#define ADD_GL_HELP_NO_SEP(scroller, str) \
-       {\
-               if (str) {\
-                       Setting_GenGroupItem_Data *item_data = setting_create_Gendial_field_def(scroller, &itc_multiline_text,\
-                                                                                                                                                                       NULL,\
-                                                                                                                                                                       NULL,\
-                                                                                                                                                                       SWALLOW_Type_LAYOUT_SPECIALIZTION_X,\
-                                                                                                                                                                       NULL, NULL, 0, str, NULL, NULL);\
-                       setting_retvm_if(NULL == item_data, NULL, "item_data is NULL");\
-                       elm_genlist_item_select_mode_set(item_data->item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);\
-               } \
-       }
-#else
 #define ADD_GL_HELP_NO_SEP(scroller, str) \
        {\
                if (str) {\
@@ -141,8 +117,6 @@ extern const Elm_Genlist_Item_Class itc_bottom_line;
                        elm_genlist_item_select_mode_set(item_data->item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);\
                } \
        }
-#endif
-
 
 #define ADD_GL_BUTTON(scroller, btn_str, btn_cb, cb_data) \
        {\
index e1e548e0c15f2df2e392f6cde0dce8d8ddde5657..6a24b9540df76bbeeb61ff8acb691f7fe9724fc3 100644 (file)
 
 #define DEF_BUF_SIZE 32
 
-#ifdef OLD_GENLIST_STYLE
-static Evas_Object *_gl_Gendial_content_get(void *data, Evas_Object *obj, const char *part);
-#endif
-
 static char *_gl_Gendial_text_get(void *data, Evas_Object *obj, const char *part);
 
-static Evas_Object *_gl_Gendial_new_content_get(void *data, Evas_Object *obj, const char *part);
+static Evas_Object *_gl_Gendial_content_get(void *data, Evas_Object *obj, const char *part);
 static char *_gl_Gendial_new_text_get(void *data, Evas_Object *obj, const char *part);
 
-#if 0
-static char *_gl_Gendial_text2_get(void *data, Evas_Object *obj, const char *part);
-#endif
-
 static void _gl_Gendial_del(void *data, Evas_Object *obj);
 
-EXPORT_PUBLIC
-const Elm_Genlist_Item_Class itc_seperator = {
-       .item_style = "dialogue/separator.transparent.2",
-       .func.text_get = NULL,
-       .func.content_get = NULL,
-       .func.state_get = NULL,
-       .func.del = NULL,
-};
-
-EXPORT_PUBLIC
-const Elm_Genlist_Item_Class itc_bottom_seperator = {
-       .item_style = NULL,
-       .func.text_get = NULL,
-       .func.content_get = NULL,
-       .func.state_get = NULL,
-       .func.del = NULL,
-};
-
-EXPORT_PUBLIC
-const Elm_Genlist_Item_Class itc_sep_line = {
-       .item_style = "dialogue/separator.transparent.2",
-       .func.text_get = _gl_Gendial_text_get,
-       .func.content_get = NULL,
-       .func.state_get = NULL,
-       .func.del = NULL,
-};
-
-EXPORT_PUBLIC
-const Elm_Genlist_Item_Class itc_bottom_line = {
-       .item_style = "bottom_line",
-       .func.text_get = NULL,
-       .func.content_get = NULL,
-       .func.state_get = NULL,
-       .func.del = NULL,
-};
-
-#ifdef OLD_GENLIST_STYLE
-#define DEFINE_ITC1(style, name) \
-       EXPORT_PUBLIC const Elm_Genlist_Item_Class name = {\
-                                                                                                          .item_style = style,\
-                                                                                                          .func.text_get = _gl_Gendial_text_get,\
-                                                                                                          .func.content_get = _gl_Gendial_content_get,\
-                                                                                                          .func.state_get = NULL,\
-                                                                                                          .func.del = _gl_Gendial_del,\
-                                                                                                         };
-#else
 #define DEFINE_ITC1(style, name) \
        EXPORT_PUBLIC const Elm_Genlist_Item_Class name = {\
                                                                                                           .item_style = style,\
                                                                                                           .func.text_get = _gl_Gendial_new_text_get,\
-                                                                                                          .func.content_get = _gl_Gendial_new_content_get,\
+                                                                                                          .func.content_get = _gl_Gendial_content_get,\
                                                                                                           .func.state_get = NULL,\
                                                                                                           .func.del = _gl_Gendial_del,\
                                                                                                          };
-#endif
 
 DEFINE_ITC1(SETTING_GENLIST_ICON_1LINE_STYLE, itc_1text);
 DEFINE_ITC1(SETTING_GENLIST_ICON_1LINE_STYLE, itc_1text_1icon_2);
@@ -115,7 +60,6 @@ DEFINE_ITC1(SETTING_GENLIST_ICON_1LINE_STYLE, itc_multiline_1text_1icon);
 
 DEFINE_ITC1("1icon", itc_bg_1icon);
 DEFINE_ITC1("1icon", itc_1icon_with_no_line);
-DEFINE_ITC1("1icon", itc_1icon_with_no_padding);
 DEFINE_ITC1("1icon", itc_1icon);
 
 DEFINE_ITC1("1text", itc_normal_1text);
@@ -138,7 +82,7 @@ DEFINE_ITC1(SETTING_GENLIST_2LINE_STYLE, itc_2text_3_parent);
 DEFINE_ITC1(SETTING_GENLIST_MULTILINE_STYLE, itc_multiline_text);
 
 DEFINE_ITC1(SETTING_GENLIST_GROUP_INDEX_STYLE, itc_group_item);
-DEFINE_ITC1("entry.main", itc_editfield);
+DEFINE_ITC1("elm/genlist/item/entry.main/default", itc_editfield);
 
 typedef struct _tagParamData {
        Setting_GenGroupItem_Data *item_data;
@@ -198,46 +142,6 @@ static void __entry_changed(void *data, Evas_Object *obj, void *event_info)
        }
 }
 
-static void __entry_unfocused(void *data, Evas_Object *obj, void *event_info) /* Unfocused callback will show guidetext and hide X marked button. */
-{
-       ret_if(!data);
-       SETTING_TRACE_BEGIN;
-       Evas_Object *entry_container = data;
-       /*whe entry unfocused, its guidetext will becomes "Input here" */
-
-       if (elm_entry_is_empty(obj)) {
-               elm_object_part_text_set(entry_container, "elm.guidetext", _("IDS_ST_BODY_TAP_TO_INSERT"));
-               elm_object_signal_emit(entry_container, "elm,state,guidetext,show", "elm");
-       }
-       elm_object_signal_emit(entry_container, "elm,state,eraser,hide", "elm");
-}
-
-static void __entry_focused(void *data, Evas_Object *obj, void *event_info) /* Focused callback will show X marked button and hide guidetext. */
-{
-       ret_if(!data);
-       SETTING_TRACE_BEGIN;
-       Evas_Object *entry_container = data;
-       /*whe entry focused, its guidetext will becomes "Input here" */
-
-       if (!elm_entry_is_empty(obj)) {
-               elm_object_signal_emit(entry_container, "elm,state,eraser,show", "elm");
-       } else {
-               elm_object_part_text_set(entry_container, "elm.guidetext", _("IDS_ST_BODY_TAP_TO_INSERT"));
-       }
-       elm_object_signal_emit(entry_container, "elm,state,guidetext,hide", "elm");
-
-       Ecore_IMF_Context *imf_context = (Ecore_IMF_Context *)elm_entry_imf_context_get(obj);
-       if (imf_context) ecore_imf_context_input_panel_show(imf_context);
-}
-
-static void __eraser_clicked(void *data, Evas_Object *obj, const char *emission, const char *source) /* When X marked button is clicked, empty entry's contents. */
-{
-       ret_if(!data);
-       Evas_Object *entry = data;
-       elm_entry_entry_set(entry, "");
-       elm_object_focus_set(entry, EINA_TRUE);
-}
-
 static void __chk_changed(void *data, Evas_Object *obj, void *event_info)
 {
        retm_if(data == NULL, "Data parameter is NULL");
@@ -446,7 +350,6 @@ static char *_gl_Gendial_new_text_get(void *data, Evas_Object *obj,
                                ret_str = (char *)g_strdup(_(item_data->sub_desc));
                        }
                }
-#if 1
                else if (!safeStrCmp(part, "elm.text.main") || !safeStrCmp(part, "elm.text.main.left") || !safeStrCmp(part, "elm.text.main.left.top")) {        /* title */
                        if (item_data->keyStr) {
                                ret_str = (char *)g_strdup(_(item_data->keyStr));       /* use item_data->keyStr */
@@ -462,7 +365,6 @@ static char *_gl_Gendial_new_text_get(void *data, Evas_Object *obj,
                                ret_str = (char *)g_strdup(_(item_data->keyStr));
                        }
                }
-#endif
                else {
                        FREE(ret_str);
                        return NULL;
@@ -504,42 +406,13 @@ static char *_gl_Gendial_text_get(void *data, Evas_Object *obj,
        return ret_str;
 }
 
-#if 0
-static char *_gl_Gendial_text2_get(void *data, Evas_Object *obj,
-                                                                  const char *part)
-{
-       /*SETTING_TRACE_BEGIN; */
-       Setting_GenGroupItem_Data *item_data =
-               (Setting_GenGroupItem_Data *) data;
-       /* SETTING_TRACE("part:%s", part); */
-
-       char *ret_str = NULL;
-       /*SETTING_TRACE("part:[%s], text:[%s] ", part, _(item_data->keyStr)); */
-       if (!safeStrCmp(part, "elm.text")) {    /* title */
-               if (item_data->keyStr) {
-                       ret_str = (char *)g_strdup(_(item_data->keyStr));       /* use item_data->keyStr */
-               }
-       } else if (!safeStrCmp(part, "elm.text.multiline")) {   /* bottom or right */
-               if (item_data->sub_desc) {
-                       ret_str = (char *)g_strdup(_(item_data->sub_desc));
-               }
-       } else {
-               FREE(ret_str);
-               return NULL;
-       }
-
-       return ret_str;
-}
-#endif
-
 static Evas_Object *__add_check_invisible(Setting_GenGroupItem_Data *item_data, Evas_Object *parent)
 {
        retv_if(!item_data || !parent, NULL);
 
        if (item_data->isItemHideFlag) return NULL;
 
-       Evas_Object *content = elm_layout_add(parent);
-       Evas_Object *check = elm_check_add(content);
+       Evas_Object *check = elm_check_add(parent);
 
        /* To fix check button flicker issue when rotate the screen*/
        if (item_data->isItemDisableFlag)
@@ -561,11 +434,7 @@ static Evas_Object *__add_check_invisible(Setting_GenGroupItem_Data *item_data,
        }
        evas_object_show(check);
 
-       /*"list/B/type.3" */
-       elm_layout_theme_set(content, "layout", "list/B/type.4", "default");
-       elm_layout_content_set(content, "elm.swallow.content", check);
-
-       return content;
+       return check;
 }
 
 
@@ -573,8 +442,8 @@ static Evas_Object *__add_check_invisible(Setting_GenGroupItem_Data *item_data,
 static Evas_Object *__add_check(Setting_GenGroupItem_Data *item_data, Evas_Object *parent)
 {
        retv_if(!item_data || !parent, NULL);
-       Evas_Object *content = elm_layout_add(parent);
-       Evas_Object *check = elm_check_add(content);
+
+       Evas_Object *check = elm_check_add(parent);
 
        /* To fix check button flicker issue when rotate the screen*/
        if (item_data->isItemDisableFlag)
@@ -602,10 +471,7 @@ static Evas_Object *__add_check(Setting_GenGroupItem_Data *item_data, Evas_Objec
        }
        evas_object_show(check);
 
-       /*"list/B/type.3" */
-       elm_layout_theme_set(content, "layout", "list/B/type.4", "default");
-       elm_layout_content_set(content, "elm.swallow.content", check);
-       return content;
+       return check;
 }
 
 static Evas_Object *__add_toggle(Setting_GenGroupItem_Data *item_data, Evas_Object *parent)
@@ -658,9 +524,9 @@ static Evas_Object *__add_radio(Setting_GenGroupItem_Data *item_data, Evas_Objec
                item_data->rgd = elm_radio_add(parent);
                elm_radio_state_value_set(item_data->rgd, -1);
        }
-       Evas_Object *ly_radio = elm_layout_add(parent);
-       elm_layout_theme_set(ly_radio, "layout", "list/B/type.4", "default");
-       Evas_Object *radio = elm_radio_add(ly_radio);
+
+       Evas_Object *radio = elm_radio_add(parent);
+
        evas_object_propagate_events_set(radio, EINA_FALSE);
        evas_object_repeat_events_set(radio, EINA_TRUE);
        elm_radio_state_value_set(radio,
@@ -679,9 +545,8 @@ static Evas_Object *__add_radio(Setting_GenGroupItem_Data *item_data, Evas_Objec
                                                                           __radio_changed,
                                                                           item_data);
        }
-       elm_layout_content_set(ly_radio, "elm.swallow.content", radio);
-       /*return check; */
-       return ly_radio;
+
+       return radio;
 }
 
 
@@ -696,15 +561,10 @@ static Evas_Object *__add_radio_right_propagate_events_set(Setting_GenGroupItem_
                item_data->rgd = elm_radio_add(parent);
                elm_radio_state_value_set(item_data->rgd, -1);
        }
-       Evas_Object *ly_radio = elm_layout_add(parent);
 
-       elm_layout_theme_set(ly_radio, "layout", "list/C/type.2", "default");
-       Evas_Object *radio = elm_radio_add(ly_radio);
+       Evas_Object *radio = elm_radio_add(parent);
 
-#if 1
-       evas_object_propagate_events_set(ly_radio, EINA_FALSE);
        evas_object_propagate_events_set(radio, EINA_FALSE);
-#endif
        elm_radio_state_value_set(radio,
                                                          item_data->chk_status);
        elm_radio_group_add(radio, item_data->rgd);
@@ -721,9 +581,8 @@ static Evas_Object *__add_radio_right_propagate_events_set(Setting_GenGroupItem_
                                                                           __radio_changed,
                                                                           item_data);
        }
-       elm_layout_content_set(ly_radio, "elm.swallow.content", radio);
 
-       return ly_radio;
+       return radio;
 }
 
 static Evas_Object *__add_radio_right(Setting_GenGroupItem_Data *item_data, Evas_Object *parent)
@@ -833,16 +692,6 @@ static Evas_Object *__add_gif(Setting_GenGroupItem_Data *item_data, Evas_Object
        return image;
 }
 
-#if 0
-static Evas_Object *__add_image(Setting_GenGroupItem_Data *item_data, Evas_Object *parent)
-{
-       retv_if(!item_data || !parent || !item_data->l_swallow_path, NULL);
-       Evas_Object *image = NULL;
-       image = setting_create_image(parent, item_data->l_swallow_path);
-       return image;
-}
-#endif
-
 static void __entry_without_layout_focused_cb(void *data, Evas_Object *obj, void *ei) /* Focused callback will show X marked button and hide guidetext. */
 {
        SETTING_TRACE_BEGIN;
@@ -1055,116 +904,6 @@ static Evas_Object *__add_entry_padding(Setting_GenGroupItem_Data *item_data, Ev
        return layout;
 }
 
-#if 0
-static Evas_Object *__add_entry(Setting_GenGroupItem_Data *item_data, Evas_Object *parent)
-{
-       retv_if(!item_data || !parent, NULL);
-       elm_genlist_mode_set(parent, ELM_LIST_COMPRESS);        /* resolve abnormal height issue */
-       Evas_Object *ed_name =
-               setting_create_editfiled(parent, _(item_data->keyStr),
-                                                                item_data->sub_desc, item_data->guide_text);
-       evas_object_pass_events_set(ed_name, 1);
-       evas_object_propagate_events_set(ed_name, 0);
-       Evas_Object *entry = elm_object_part_content_get(ed_name, "elm.swallow.content");
-       item_data->eo_check = entry;
-       elm_entry_input_panel_layout_set(entry,
-                                                                        item_data->input_type);
-
-       if (item_data->isSinglelineFlag) {
-               elm_entry_scrollable_set(entry, EINA_TRUE);
-               elm_entry_single_line_set(entry, EINA_TRUE);
-       }
-
-       if (item_data->isPasswordFlag) {
-               elm_entry_single_line_set(entry, EINA_TRUE);
-               elm_entry_password_set(entry, EINA_TRUE);
-       }
-
-       if (item_data->limit_filter_data) {
-               elm_entry_markup_filter_append
-               (entry,
-                elm_entry_filter_limit_size,
-                item_data->limit_filter_data);
-
-               if (item_data->maxlength_reached_cb) {
-                       evas_object_smart_callback_add(entry,
-                                                                                  "maxlength,reached",
-                                                                                  item_data->maxlength_reached_cb,
-                                                                                  item_data);
-               } else {
-                       evas_object_smart_callback_add(entry,
-                                                                                  "maxlength,reached",
-                                                                                  __max_len_reached,
-                                                                                  item_data);
-               }
-       }
-       if (item_data->stop_change_cb) {/*invoked when stop focusing on */
-               evas_object_smart_callback_add(entry,
-                                                                          "unfocused",
-                                                                          item_data->stop_change_cb,
-                                                                          item_data);
-       } else {
-               evas_object_smart_callback_add(entry,
-                                                                          "unfocused",
-                                                                          __entry_unfocused,
-                                                                          ed_name);
-       }
-       if (item_data->digits_filter_data) {
-               elm_entry_markup_filter_append(entry,
-                                                                          elm_entry_filter_accept_set,
-                                                                          item_data->digits_filter_data);
-       }
-
-       /* for Setting App, All the entrys's context popup shouldn't be able */
-       /* to insert images, text is the only one can be inserted. */
-       elm_entry_cnp_mode_set(entry, ELM_CNP_MODE_PLAINTEXT);
-
-       if (item_data->chk_change_cb) {
-               evas_object_smart_callback_add(entry,
-                                                                          "changed",
-                                                                          item_data->chk_change_cb,
-                                                                          item_data);
-       } else {
-               /*default handle */
-               evas_object_smart_callback_add(entry, "changed", __entry_changed, item_data);
-       }
-
-       /* callback for handling enter key */
-       if (item_data->activated_cb) {
-               evas_object_smart_callback_add(entry,
-                                                                          "activated",
-                                                                          item_data->activated_cb,
-                                                                          item_data);
-       }
-
-       if (item_data->focus_cb) {
-               evas_object_smart_callback_add(entry, "focused", item_data->focus_cb, item_data);
-       } else {
-               evas_object_smart_callback_add(entry, "focused", __entry_focused, ed_name);
-       }
-
-       elm_object_signal_callback_add(ed_name, "elm,eraser,clicked", "elm", __eraser_clicked, entry);
-
-       if (item_data->start_change_cb) {
-               evas_object_event_callback_add(entry, EVAS_CALLBACK_KEY_DOWN, (Evas_Object_Event_Cb)(item_data->start_change_cb), item_data->userdata);
-       } else {
-               evas_object_event_callback_add(entry, EVAS_CALLBACK_KEY_DOWN, __entry_keydown, item_data);
-       }
-
-       Ecore_IMF_Context *imf_context = (Ecore_IMF_Context *)elm_entry_imf_context_get(entry);
-       if (imf_context) {
-               ecore_imf_context_input_panel_event_callback_add(imf_context,
-                                                                                                                ECORE_IMF_INPUT_PANEL_STATE_EVENT,
-                                                                                                                item_data->x_callback_cb,
-                                                                                                                item_data->userdata);
-       }
-       if (item_data->input_panel_disable_flag) {
-               elm_entry_input_panel_enabled_set(entry, EINA_FALSE);
-       }
-       return ed_name;
-}
-#endif
-
 static Evas_Object *__add_5step_slider(Setting_GenGroupItem_Data *item_data, Evas_Object *parent)
 {
        SETTING_TRACE_BEGIN;
@@ -1208,22 +947,6 @@ static Evas_Object *__add_slider(Setting_GenGroupItem_Data *item_data, Evas_Obje
        return li_slider;
 }
 
-#if 0
-static Evas_Object *__add_layout(Setting_GenGroupItem_Data *item_data, Evas_Object *parent)
-{
-       retv_if(!item_data || !parent, NULL);
-       Evas_Object *layout = elm_layout_add(parent);
-       evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-       setting_retvm_if(layout == NULL, FALSE, "layout == NULL");
-       elm_layout_theme_set(layout, "layout", "application", "default");
-       int w = item_data->chk_status;
-       int h = item_data->chk_status;
-       elm_object_part_content_set(layout, "elm.swallow.bg", setting_create_blank_rect_customize(parent, w, h));
-       /*elm_object_part_content_set(layout, "elm.swallow.content", navi); */
-       return layout;
-}
-#endif
-
 static void __picker_popup_cancel_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info)
 {
        SETTING_TRACE_BEGIN;
@@ -1306,9 +1029,7 @@ static void _datefield_date_btn_clicked_cb(void *data, Evas_Object *obj, void *e
        Evas_Object *datetime = elm_datetime_add(param->parent);
        elm_object_style_set(datetime, "date_layout");
        elm_datetime_format_set(datetime, "%d/%b/%Y");
-#if 1
        _datefield_set_min_max(datetime);
-#endif
        evas_object_data_set(datetime, "popup", popup);
 
        /*--------------------------------------- */
@@ -1332,9 +1053,7 @@ static void _datefield_time_btn_clicked_cb(void *data, Evas_Object *obj, void *e
        Datefield_Paramdata      *param = (Datefield_Paramdata *)data;
 
        Evas_Object *datetime = elm_datetime_add(param->parent);
-#if 1
        _datefield_set_min_max(datetime);
-#endif
 
        elm_object_style_set(datetime, "date_layout");
 
@@ -1472,10 +1191,8 @@ static Evas_Object *__add_datefield_new(Setting_GenGroupItem_Data *item_data, Ev
        evas_object_smart_callback_add(btn_right, "clicked", _datefield_time_btn_clicked_cb , param);
        evas_object_show(btn_right);
 
-#if 1
        param->item_data->btn_left = btn_left;
        param->item_data->btn_right = btn_right;
-#endif
        Evas_Object *box = elm_box_add(parent);
        evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        evas_object_size_hint_align_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL);
@@ -1511,33 +1228,6 @@ static Evas_Object *__add_datefield_new(Setting_GenGroupItem_Data *item_data, Ev
        return box;
 }
 
-#if 0
-static Evas_Object *__add_process(Setting_GenGroupItem_Data *item_data, Evas_Object *parent)
-{
-       retv_if(!item_data || !parent, NULL);
-       Evas_Object *progressbar = elm_progressbar_add(parent);
-       elm_object_style_set(progressbar, PROGRESSBAR_STYLE);
-       evas_object_size_hint_align_set(progressbar,
-                                                                       EVAS_HINT_FILL, 0.5);
-       evas_object_size_hint_weight_set(progressbar,
-                                                                        EVAS_HINT_EXPAND,
-                                                                        EVAS_HINT_EXPAND);
-       elm_progressbar_pulse(progressbar, EINA_TRUE);
-       evas_object_show(progressbar);
-       return progressbar;
-}
-
-static Evas_Object *__add_radio_lable(Setting_GenGroupItem_Data *item_data, Evas_Object *parent)
-{
-       retv_if(!item_data || !parent, NULL);
-
-       /*a.radio.. */
-       Evas_Object *radio = __add_radio(item_data, parent);
-
-       return radio;
-}
-#endif
-
 static Evas_Object *__add_left_default(Setting_GenGroupItem_Data *item_data, Evas_Object *parent)
 {
        if (!item_data || !parent || !item_data->l_swallow_path) {
@@ -1552,32 +1242,18 @@ static Evas_Object *__add_left_default(Setting_GenGroupItem_Data *item_data, Eva
                evas_object_size_hint_aspect_set(icon, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
                return icon;
        } else if (SWALLOW_Type_1ICON_SMALL_ICON == item_data->swallow_type) {
-               /*Evas_Object *ic = NULL; */
-               /*ic = elm_layout_add(parent); */
-               Evas_Object *c = NULL;
-
-               /*elm_layout_theme_set(ic, "layout", "list/B/type.4", "default"); */
-               c = elm_image_add(parent);
+               Evas_Object *c = elm_image_add(parent);
                elm_image_file_set(c, item_data->l_swallow_path, NULL);
                evas_object_size_hint_align_set(c, EVAS_HINT_FILL, EVAS_HINT_FILL);
                evas_object_size_hint_weight_set(c, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-               /*elm_layout_content_set(ic, "elm.swallow.content", c); */
-               /*return ic; */
                return c;
        } else {
-               Evas_Object *ic = NULL;
-               ic = elm_layout_add(parent);
-               Evas_Object *c = NULL;
-
-               elm_layout_theme_set(ic, "layout", "list/B/type.4", "default");
-               c = elm_image_add(parent);
+               Evas_Object *c = elm_image_add(parent);
                elm_image_file_set(c, item_data->l_swallow_path, NULL);
                setting_decorate_image_RGBA(c, 14, 41, 73, 255);
                evas_object_size_hint_align_set(c, EVAS_HINT_FILL, EVAS_HINT_FILL);
                evas_object_size_hint_weight_set(c, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-               elm_layout_content_set(ic, "elm.swallow.content", c);
-
-               return ic;
+               return c;
        }
 
 }
@@ -1588,20 +1264,8 @@ static Evas_Object *__add_right_default(Setting_GenGroupItem_Data *item_data, Ev
                return NULL;
        }
 
-#if 0
-       Evas_Object *icon = elm_icon_add(parent);
-       elm_image_file_set(icon, item_data->r_swallow_path, NULL);
-       evas_object_size_hint_aspect_set(icon, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
-       if (!safeStrCmp(item_data->r_swallow_path, SETTING_IMAGE_PATH_CFG"00_list_button_expand_closed.png"))
-               else if (!safeStrCmp(item_data->r_swallow_path, SETTING_IMAGE_PATH_CFG"00_list_button_expand_opened.png"))
-                       return icon;
-#else
-       Evas_Object *ic = NULL;
-       ic = elm_layout_add(parent);
-       Evas_Object *icon = NULL;
-
-       elm_layout_theme_set(ic, "layout", "list/C/type.3", "default");
-       icon = elm_image_add(parent);
+       Evas_Object *icon = elm_image_add(parent);
+
        if (!safeStrCmp(item_data->r_swallow_path, SETTING_IMAGE_PATH_CFG"00_list_button_expand_closed.png"))
                setting_decorate_image_RGBA(icon, 14, 41, 73, 255);
        else if (!safeStrCmp(item_data->r_swallow_path, SETTING_IMAGE_PATH_CFG"00_list_button_expand_opened.png"))
@@ -1609,10 +1273,9 @@ static Evas_Object *__add_right_default(Setting_GenGroupItem_Data *item_data, Ev
        elm_image_file_set(icon, item_data->r_swallow_path, NULL);
        evas_object_size_hint_align_set(icon, 0.0, EVAS_HINT_FILL);
        evas_object_size_hint_weight_set(icon, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-       elm_layout_content_set(ic, "elm.swallow.content", icon);
-       return ic;
 
-#endif
+       return icon;
+
 }
 
 /* draw handler */
@@ -1665,8 +1328,8 @@ static void __multiline_eraser_clicked(void *data, Evas_Object *obj, void *event
        elm_entry_entry_set(entry, "");
 }
 
-static Evas_Object *_gl_Gendial_new_content_get(void *data, Evas_Object *obj,
-                                                                                               const char *part)
+static Evas_Object *_gl_Gendial_content_get(void *data, Evas_Object *obj,
+                                               const char *part)
 {
        retv_if(!data, NULL);
        Setting_GenGroupItem_Data *item_data = data;
@@ -1738,73 +1401,6 @@ static Evas_Object *_gl_Gendial_new_content_get(void *data, Evas_Object *obj,
 }
 
 
-#ifdef OLD_GENLIST_STYLE
-static Evas_Object *_gl_Gendial_content_get(void *data, Evas_Object *obj,
-                                                                                       const char *part)
-{
-       retv_if(!data, NULL);
-       Setting_GenGroupItem_Data *item_data = data;
-       retv_if(!data, NULL);
-       __Content_Drawer *cd_list = NULL;
-       __drawer_fp fp = NULL;
-       /*SETTING_TRACE("content get [%s]",part); */
-
-
-       if (!safeStrCmp(part, "elm.icon.1")) { /* LEFT AREA */
-               if (item_data->swallow_type == SWALLOW_Type_LAYOUT_EDITFIELD
-                       && item_data->isPasswordFlag == TRUE)
-                       return NULL;
-               fp = __add_left_default; /*hold default drawer */
-               cd_list = __cd_left;
-       } else if (!safeStrCmp(part, "elm.icon.2")) { /* RIGHT AREA */
-               if (item_data->swallow_type == SWALLOW_Type_LAYOUT_EDITFIELD
-                       && item_data->isPasswordFlag == TRUE)
-                       return NULL;
-               fp = __add_right_default; /*hold default drawer */
-               cd_list = __cd_right;
-       } else if (!safeStrCmp(part, "elm.icon")) { /* CENTER WHOLE */
-               fp = __add_left_default; /*hold default drawer */
-               cd_list = __cd_left;
-       } else if (!safeStrCmp(part, "elm.swallow.end")) {
-               /*the default value of fp is NULL here */
-               cd_list = __cd_end;
-       }
-       /* To do : add code for editfield */
-       else if (!safeStrCmp(part, "elm.icon.entry")) {
-               if (item_data->swallow_type == SWALLOW_Type_LAYOUT_DATEFIELD) {
-                       /*fp = __add_datefield; */
-                       fp = __add_datefield_new;
-               } else {
-                       /*fp = __add_entry_without_layout; */
-                       fp = __add_entry_padding;
-               }
-       } else if (!safeStrCmp(part, "elm.icon.eraser")) {
-               /*fp = __add_button_eraser; */
-               Evas_Object *btn = elm_button_add(obj);
-               elm_object_style_set(btn, "editfield_clear"); /*Make "X" marked button by changing style. */
-               evas_object_smart_callback_add(btn, "clicked", __multiline_eraser_clicked, item_data);
-               return btn;
-       } else if (!safeStrCmp(part, "elm.icon.edit")) {
-               Evas_Object *btn = elm_button_add(obj);
-               elm_object_style_set(btn, "minus");
-               evas_object_propagate_events_set(btn, EINA_FALSE);
-               return btn;
-       }
-       /* End. */
-
-       if (cd_list) {
-               int idx = 0;
-               for (; idx < SWALLOW_Type_MAX; idx++) {
-                       if (item_data->swallow_type == cd_list[idx].type) { /*match using swallow type */
-                               fp = cd_list[idx].draw;
-                               break;
-                       }
-               }
-       }
-       return fp ? fp(item_data, obj) : NULL;
-}
-#endif /* OLD_GENLIST_STYLE */
-
 static void _gl_Gendial_del(void *data, Evas_Object *obj)
 {
        /* SETTING_TRACE_BEGIN; */
@@ -1846,21 +1442,12 @@ EXPORT_PUBLIC
 bool setting_create_Gendial_itc(const char *item_style,
                                                                Elm_Genlist_Item_Class *itc)
 {
-#ifdef OLD_GENLIST_STYLE
-       itc->item_style = item_style;
-       itc->func.text_get = _gl_Gendial_text_get;
-       itc->func.content_get = _gl_Gendial_content_get;
-       itc->func.state_get = NULL;
-       itc->func.del = _gl_Gendial_del;        /* _gl_Gendial_del; */
-       return TRUE;
-#else
        itc->item_style = item_style;
        itc->func.text_get = _gl_Gendial_new_text_get;
-       itc->func.content_get = _gl_Gendial_new_content_get;
+       itc->func.content_get = _gl_Gendial_content_get;
        itc->func.state_get = NULL;
        itc->func.del = _gl_Gendial_del;        /* _gl_Gendial_del; */
        return TRUE;
-#endif
 }
 
 /**
@@ -2524,51 +2111,6 @@ void setting_genlist_item_disabled_set(Setting_GenGroupItem_Data *item_data, int
        }
 }
 
-
-EXPORT_PUBLIC
-void setting_check_genlist_item_bottom_line(Elm_Object_Item *item)
-{
-#if 0
-       /*SETTING_TRACE_BEGIN; */
-       ret_if(!item);
-       const Elm_Genlist_Item_Class *itc = elm_genlist_item_item_class_get(item);
-       if (itc && itc->item_style) {
-               /*SETTING_TRACE("itc->item_style:%s", itc->item_style); */
-               if (0 == safeStrCmp(itc->item_style, "groupindex")
-                       || 0 == safeStrNCmp(itc->item_style, "dialogue/separator", safeStrLen("dialogue/separator"))
-                       || 0 == safeStrNCmp(itc->item_style, "bottom_line", safeStrLen("bottom_line"))
-                       || 0 == safeStrNCmp(itc->item_style, "multiline_sub", safeStrLen("multiline_sub"))
-                       || 0 == safeStrNCmp(itc->item_style, "1icon", safeStrLen("1icon"))
-                  ) {
-                       if (0 == safeStrCmp(itc->item_style, "groupindex")) {
-                               Elm_Object_Item *prev_item = elm_genlist_item_prev_get(item);
-                               if (prev_item) {
-                                       const Elm_Genlist_Item_Class *itc2 = elm_genlist_item_item_class_get(prev_item);
-                                       if (itc2 && !safeStrCmp(itc2->item_style, "bottom_line")) {
-                                               elm_object_item_del(prev_item);
-                                       }
-                               }
-                       }
-                       return;
-               } else {
-
-                       /*SETTING_TRACE("Adding[prev_item:%p, next_item:%p].....", prev_item, next_item); */
-                       Evas_Object *scroller = elm_object_item_widget_get(item);
-                       Elm_Object_Item *parent = elm_genlist_item_parent_get(item);
-                       /*SETTING_TRACE("parent:%p", parent); */
-                       if (parent) { /*expandable */
-                               Elm_Object_Item *it = elm_genlist_item_insert_before(scroller, &(itc_bottom_line), NULL, parent,
-                                                                                                                                        item, ELM_GENLIST_ITEM_NONE, NULL, NULL);
-                               elm_genlist_item_select_mode_set(it, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
-                               Evas_Object *real_obj = elm_object_item_edje_get(item);
-                               setting_decorate_image_RGBA(real_obj, 0, 0, 85, 255);
-                       }
-
-               }
-       }
-#endif
-}
-
 EXPORT_PUBLIC
 void __gl_realized_cb(void *data, Evas_Object *obj, void *event_info)
 {
@@ -2578,9 +2120,6 @@ void __gl_realized_cb(void *data, Evas_Object *obj, void *event_info)
 
        /*? Setting_GenGroupItem_Data *list_item = (Setting_GenGroupItem_Data *) */
        elm_object_item_data_get(item);
-
-       /*/ #if SUPPORT_TTS */
-       setting_check_genlist_item_bottom_line(item);
 }
 
 /*for check,radio,slider etc.. */
index d174124c7bfdb909628daeb1a066f49105dddd03..51ecce913833a5ff79626856cfd27afdacc855f5 100644 (file)
@@ -326,7 +326,7 @@ static int setting_phone_region_format_get_region_fmt(char *list[],
        i = 0;
        EINA_LIST_FOREACH(region_list, iter, item_data) {
                if (item_data) {
-                       list[i] = (char *)g_strdup(item_data->desc);
+                       list[i] = elm_entry_utf8_to_markup(item_data->desc);
                        item_idx[i] = i;
                        region_keyStr[i] = (char *)g_strdup(item_data->key);
                        free(item_data);
@@ -758,10 +758,6 @@ static Eina_Bool __region_animator_cb(void *data)
                elm_radio_value_set(ad->chk_region, ad->selected_region_idx);
                ad->prev_region = ad->selected_region_idx;
 
-               Elm_Object_Item *item = NULL;
-               item = elm_genlist_item_append(ad->gl_region, &itc_bottom_seperator, NULL, NULL,
-                                                                          ELM_GENLIST_ITEM_NONE, NULL, NULL);
-               elm_genlist_item_select_mode_set(item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
                return ECORE_CALLBACK_CANCEL;
        }
 
index 6b92bcae4c1aaa9aeb3de23892333b62c8de25ee..73d0ce40b6febb574ab382f6f5c7bdc15f355273 100644 (file)
@@ -1006,19 +1006,11 @@ Evas_Object *setting_sound_init(void *data)
 
        setting_create_Gendial_itc(SETTING_GENLIST_LEFT_ICON_CONTENT_ICON_STYLE, &(ad->itc_layout));
 
-#ifdef OLD_GENLIST_STYLE
-       ad->itc_layout.func.content_get = __sound_slider_icon_get;
-#else
        ad->itc_layout.func.content_get = __sound_slider_new_icon_get;
-#endif
 
        setting_create_Gendial_itc(SETTING_GENLIST_LEFT_ICON_CONTENT_ICON_STYLE, &(ad->itc_layout_1icon));
 
-#ifdef OLD_GENLIST_STYLE
-       ad->itc_layout_1icon.func.content_get = __sound_slider_icon_get;
-#else
        ad->itc_layout_1icon.func.content_get = __sound_slider_new_icon_get;
-#endif
 
        /* register view node table */
        setting_view_node_table_intialize();
index d42001b491049d137ee815e7dd90191d4be80a88..4c914c2677d55569aa841c29880bc3fd2353804a 100644 (file)
 #include "setting-storage-utils.h"
 #include "setting-storage-async-worker.h"
 #include "setting-storage-main.h"
-#if 0
-#define SETTING_STORAGE_PIE_RECT_WIDTH (432 * WIDGET_SCALE_FACTOR)
-#define SETTING_STORAGE_PIE_RECT_HEIGHT (414 * WIDGET_SCALE_FACTOR)
-#define SETTING_STORAGE_PIE_CYCLE_SIZE (294 * WIDGET_SCALE_FACTOR)
-#else
+
 #define SETTING_STORAGE_PIE_RECT_WIDTH (ELM_SCALE_SIZE(432))
 #define SETTING_STORAGE_PIE_RECT_HEIGHT (ELM_SCALE_SIZE(414))
-#define SETTING_STORAGE_PIE_CYCLE_SIZE (ELM_SCALE_SIZE(294))
-#endif
+#define SETTING_STORAGE_PIE_CYCLE_SIZE (ELM_SCALE_SIZE(123))
 
 
 
@@ -233,13 +228,13 @@ Evas_Object *storageUg_main_pie_item_get_icon(void *data, Evas_Object *obj,
 
        retv_if(NULL == obj, NULL);
        retv_if(NULL == data, NULL);
-       retvm_if(safeStrCmp(part, "elm.icon"), NULL, "part(%s) Invaild", part);
+       retvm_if(safeStrCmp(part, "elm.swallow.content"), NULL, "part(%s) Invaild", part);
 
        layout_w = SETTING_STORAGE_PIE_RECT_WIDTH;
        layout_h = SETTING_STORAGE_PIE_RECT_HEIGHT;
 
        layout = elm_layout_add(obj);
-       elm_layout_file_set(layout, SETTING_THEME_EDJ_NAME, "storage_pie");
+       Eina_Bool res = elm_layout_file_set(layout, SETTING_THEME_EDJ_NAME, "storage_pie");
 
        evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
 
@@ -260,7 +255,6 @@ Evas_Object *storageUg_main_pie_item_get_icon(void *data, Evas_Object *obj,
 
        /*pie */
        storageUg_main_part_pie_graph_set(layout, "pie_rect", ad);
-       /*setting_resize_object(layout, layout_w, layout_h); */
        evas_object_show(layout);
 
        return layout;
index bfcaec1ce422056a75e9bb23e794c18caf513493..2f007def6d717f89fae452c01937b5f04871ac57 100644 (file)
@@ -258,11 +258,7 @@ void storageug_genlist_text_update(Setting_GenGroupItem_Data *item_data,
 
        G_FREE(item_data->sub_desc);
        item_data->sub_desc = (char *)g_strdup(desc);
-#if OLD_GENLIST_STYLE
-       elm_genlist_item_fields_update(item_data->item, "elm.text.sub.left.bottom", ELM_GENLIST_ITEM_FIELD_TEXT);
-#else
        elm_genlist_item_fields_update(item_data->item, "elm.text.sub", ELM_GENLIST_ITEM_FIELD_TEXT);
-#endif
 }
 
 void storageUg_get_internal_detail_cb(int fn_result, SettingStorageUG *ad)
index 7a50ef2bec11cbff44ea6b0004d22a6cccd1d217..f7d80983bfb56ea5581f17572dca31fe77fcfe40 100644 (file)
@@ -103,7 +103,7 @@ static inline void storageUg_init_itcs(SettingStorageUG *ad)
        setting_create_Gendial_itc("2line.top.4", &(ad->itc_2text_1icon_3));
        setting_create_Gendial_itc("dialogue/1text", &(ad->itc_1text));
        setting_create_Gendial_itc("1text.1icon.3", &(ad->itc_1text_1icon));
-       setting_create_Gendial_itc("1icon", &(ad->itc_pie));
+       setting_create_Gendial_itc(SETTING_GENLIST_LEFT_ICON_CONTENT_ICON_STYLE, &(ad->itc_pie));
        ad->itc_pie.func.content_get = storageUg_main_pie_item_get_icon;
        ad->itc_pie.func.del = NULL;
        setting_create_Gendial_itc("1icon/no_padding_line", &(ad->itc_notice));