From 9c68105f6c4d2347993781879687fd20f2985065 Mon Sep 17 00:00:00 2001 From: Shinwoo Kim Date: Thu, 20 Jul 2017 08:23:40 +0900 Subject: [PATCH] Fix bugs - duplicated naviframe item, and i18n (1) duplicated naviframe item - app_control created what app_create created. So there were two pushed same(duplicated) naviframe items. (2) i18n - The message ID was used without using gettext Change-Id: Ib25f543d80337af1ef0fd9ab1d634f93206dd6b6 --- src/setting-accessibility-menu.c | 2 +- src/setting-accessibility-vision.c | 2 +- src/setting-accessibility.c | 6 ++---- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/setting-accessibility-menu.c b/src/setting-accessibility-menu.c index 21956d1..819c7c1 100644 --- a/src/setting-accessibility-menu.c +++ b/src/setting-accessibility-menu.c @@ -134,7 +134,7 @@ Evas_Object *setting_accessibility_menu_create_view(void *data) elm_object_part_content_set(pObj_layout, "elm.genlist", pObj_genlist); Elm_Object_Item *pObjItem_nf = NULL; - pObjItem_nf = elm_naviframe_item_push(ad->pObj_nf, "IDS_ST_BODY_ACCESSIBILITY", NULL, NULL, pObj_layout, "empty"); + pObjItem_nf = elm_naviframe_item_push(ad->pObj_nf, access_gettext("IDS_ST_BODY_ACCESSIBILITY"), NULL, NULL, pObj_layout, "empty"); elm_naviframe_item_title_enabled_set(pObjItem_nf, EINA_FALSE, EINA_FALSE); elm_object_item_domain_text_translatable_set(pObjItem_nf, SETTING_ACCESSIBILITY_PACKAGE_NAME, EINA_TRUE); elm_naviframe_item_pop_cb_set(pObjItem_nf, __setting_accessibility_menu_naviframe_pop_cb, NULL); // pop callback diff --git a/src/setting-accessibility-vision.c b/src/setting-accessibility-vision.c index 66e6a59..76ab7ae 100644 --- a/src/setting-accessibility-vision.c +++ b/src/setting-accessibility-vision.c @@ -202,7 +202,7 @@ setting_accessibility_vision_create_view(void *data) elm_object_part_content_set(pObj_layout, "elm.genlist", pObj_genlist); Elm_Object_Item *pObjItem_nf = NULL; - pObjItem_nf = elm_naviframe_item_push(ad->pObj_nf, "IDS_ST_HEADER_VISION", NULL, NULL, pObj_layout, "empty"); + pObjItem_nf = elm_naviframe_item_push(ad->pObj_nf, access_gettext("IDS_ST_HEADER_VISION"), NULL, NULL, pObj_layout, "empty"); elm_naviframe_item_title_enabled_set(pObjItem_nf, EINA_FALSE, EINA_FALSE); elm_object_item_domain_text_translatable_set(pObjItem_nf, SETTING_ACCESSIBILITY_PACKAGE_NAME, EINA_TRUE); elm_naviframe_item_pop_cb_set(pObjItem_nf, __setting_accessibility_vision_naviframe_pop_cb, NULL); diff --git a/src/setting-accessibility.c b/src/setting-accessibility.c index d087708..b8b4e78 100644 --- a/src/setting-accessibility.c +++ b/src/setting-accessibility.c @@ -145,8 +145,6 @@ app_control(app_control_h app_control, void *data) DBG("API() entered."); - __setting_accessibility_create_common_view(ad); - setting_accessibility_menu_create_view(ad); elm_win_activate(ad->pObj_win_main); } @@ -229,10 +227,10 @@ main(int argc, char *argv[]) app_event_handler_h handlers[5] = {NULL, }; event_callback.create = app_create; + event_callback.app_control = app_control; + event_callback.resume = app_resume; event_callback.terminate = app_terminate; event_callback.pause = app_pause; - event_callback.resume = app_resume; - event_callback.app_control = app_control; ui_app_add_event_handler(&handlers[APP_EVENT_LOW_BATTERY], APP_EVENT_LOW_BATTERY, ui_app_low_battery, &ad); ui_app_add_event_handler(&handlers[APP_EVENT_LOW_MEMORY], APP_EVENT_LOW_MEMORY, ui_app_low_memory, &ad); -- 2.34.1