From 70343da340ba942f8de5a03359fc054687d06693 Mon Sep 17 00:00:00 2001 From: "seolhee, kim" Date: Tue, 7 Jun 2016 17:46:14 +0900 Subject: [PATCH] Remove cancel button of password-enforce-change syspopup Change-Id: I5201cbabd276fb9d9bcd95b4e4a71c6a67829eab Signed-off-by: seolhee, kim --- tools/syspopup/po/en_US.po | 10 ++------- tools/syspopup/po/ko_KR.po | 10 ++------- tools/syspopup/src/popup-list.c | 8 ++++---- tools/syspopup/src/ui.c | 45 +++++++++++++++++++++-------------------- 4 files changed, 31 insertions(+), 42 deletions(-) diff --git a/tools/syspopup/po/en_US.po b/tools/syspopup/po/en_US.po index c62f52b..22dbb6a 100644 --- a/tools/syspopup/po/en_US.po +++ b/tools/syspopup/po/en_US.po @@ -16,12 +16,6 @@ msgstr "Tap here to create Separated Zone." msgid "IDS_DPM_NOTI_ZONE_CREATE" msgstr "Separated zone creation" -msgid "IDS_DPM_NOTI_BODY_PASSWORD_ENFORCE_CHANGE" -msgstr "Tap here to change password." - -msgid "IDS_DPM_NOTI_PASSWORD_ENFORCE_CHANGE" -msgstr "Change password" - msgid "IDS_DPM_BODY_ZONE_CREATE" msgstr "Security policy force to use of the Separated Zone. Tap OK to create Separated zone." @@ -44,10 +38,10 @@ msgid "IDS_DPM_BODY_PASSWORD_RESET" msgstr "Security policy set a new password." msgid "IDS_DPM_BODY_PASSWORD_ENFORCE_CHANGE" -msgstr "Security policy enforce the password change." +msgstr "You must change your password to continue." msgid "IDS_DPM_PASSWORD" -msgstr "Password" +msgstr "Reset Password" msgid "IDS_DPM_SCREEN_CAPTURE" msgstr "Screen capture" diff --git a/tools/syspopup/po/ko_KR.po b/tools/syspopup/po/ko_KR.po index 7875b8d..48744ed 100644 --- a/tools/syspopup/po/ko_KR.po +++ b/tools/syspopup/po/ko_KR.po @@ -16,12 +16,6 @@ msgstr "여기를 누르면 Separated Zone을 생성합니다." msgid "IDS_DPM_NOTI_ZONE_CREATE" msgstr "Separate Zone 생성" -msgid "IDS_DPM_NOTI_BODY_PASSWORD_ENFORCE_CHANGE" -msgstr "여기를 누르면 비밀번호를 변경합니다." - -msgid "IDS_DPM_NOTI_PASSWORD_ENFORCE_CHANGE" -msgstr "비밀번호 변경" - msgid "IDS_DPM_BODY_ZONE_CREATE" msgstr "보안정책에 따라 Separated Zone을 사용합니다. OK 버튼을 누르면 Separated Zone을 생성합니다." @@ -44,10 +38,10 @@ msgid "IDS_DPM_BODY_PASSWORD_RESET" msgstr "보안정책에 따라 새로운 비밀번호를 설정합니다." msgid "IDS_DPM_BODY_PASSWORD_ENFORCE_CHANGE" -msgstr "보안정책에 따라 비밀 번호를 변경합니다." +msgstr "계속하려면 비밀번호를 변경해야 합니다." msgid "IDS_DPM_PASSWORD" -msgstr "비밀번호" +msgstr "비밀번호 재설정" msgid "IDS_DPM_SCREEN_CAPTURE" msgstr "화면 캡처" diff --git a/tools/syspopup/src/popup-list.c b/tools/syspopup/src/popup-list.c index 595f0d1..0ca8ac2 100644 --- a/tools/syspopup/src/popup-list.c +++ b/tools/syspopup/src/popup-list.c @@ -25,16 +25,16 @@ popup_info_s popup_list[] = { - /* ID | TITLE_PREFIX | TITLE_TEXT | CONTENT_TEXT | POPUP_STYLE | LEFT_BUTTON | RIGHT_BUTTON | NOTI_TITLE | NOTI_CONTENT */ + /* ID | TEXT_PREFIX | TITLE_TEXT | CONTENT_TEXT | POPUP_STYLE | LEFT_BUTTON | RIGHT_BUTTON | NOTI_TITLE | NOTI_CONTENT */ /* Application Policy */ - {"package-installation-mode", false, "IDS_DPM_PACKAGE_INSTALLATION", NULL, "toast", NULL, NULL, NULL, NULL}, - {"package-uninstallation-mode", false, "IDS_DPM_PACKAGE_UNINSTALLATION", NULL, "toast", NULL, NULL, NULL, NULL}, + {"package-installation-mode", true, "IDS_DPM_PACKAGE_INSTALLATION", NULL, "toast", NULL, NULL, NULL, NULL}, + {"package-uninstallation-mode", true, "IDS_DPM_PACKAGE_UNINSTALLATION", NULL, "toast", NULL, NULL, NULL, NULL}, /* Password Policy */ {"password-expires", true, "IDS_DPM_PASSWORD", "IDS_DPM_BODY_PASSWORD_EXPIRES", "toast", NULL, NULL, NULL, NULL}, {"password-reset", true, "IDS_DPM_PASSWORD", "IDS_DPM_BODY_PASSWORD_RESET", "toast", NULL, NULL, NULL, NULL}, - {"password-enforce-change", true, "IDS_DPM_PASSWORD", "IDS_DPM_BODY_PASSWORD_ENFORCE_CHANGE", "default", "IDS_DPM_CANCEL", "IDS_DPM_OK", "IDS_DPM_NOTI_PASSWORD_ENFORCE_CHANGE", "IDS_DPM_NOTI_BODY_PASSWORD_ENFORCE_CHANGE"}, + {"password-enforce-change", false, "IDS_DPM_PASSWORD", "IDS_DPM_BODY_PASSWORD_ENFORCE_CHANGE", "default", NULL, "IDS_DPM_OK", NULL, NULL}, /* Restriction Policy */ {"wifi", true, "IDS_DPM_WIFI", NULL, "toast", NULL, NULL, NULL, NULL}, diff --git a/tools/syspopup/src/ui.c b/tools/syspopup/src/ui.c index 1eadf67..9e0027f 100644 --- a/tools/syspopup/src/ui.c +++ b/tools/syspopup/src/ui.c @@ -68,11 +68,11 @@ static int __send_launch_request(app_control_h app_control) static void __ok_btn_cb(void *data, Evas_Object *obj, void *event_info) { - Evas_Object *popup = (Evas_Object *)evas_object_data_get(obj, "target"); + Evas_Object *popup = (Evas_Object *) data; evas_object_data_set(popup, "selected", "ok"); /* call application */ - app_control_h app_control = (app_control_h) data; + app_control_h app_control = (app_control_h)evas_object_data_get(popup, "app-control"); if (__send_launch_request(app_control) != 0) dlog_print(DLOG_ERROR, LOG_TAG, "failed to send launch request"); @@ -159,11 +159,23 @@ static Eina_Bool __home_key_cb(void *data, int type, void *event) return EINA_TRUE; } +static void __create_popup_btn(Evas_Object *popup, char *part, char *btn_text, Evas_Smart_Cb func) +{ + Evas_Object *btn = NULL; + + btn = elm_button_add(popup); + elm_object_style_set(btn, "popup"); + elm_object_text_set(btn, __(btn_text)); + elm_object_part_content_set(popup, part, btn); + evas_object_smart_callback_add(btn, "clicked", func, popup); + + return; +} + void _create_syspopup(const char *id, char *style, const char *status, app_control_h svc) { Evas_Object *win = NULL; Evas_Object *popup = NULL; - Evas_Object *left_btn = NULL, *right_btn = NULL; popup_info_s *info = NULL; int ret = 0; @@ -188,6 +200,7 @@ void _create_syspopup(const char *id, char *style, const char *status, app_contr info->style = style; elm_object_style_set(popup, info->style); + eext_object_event_callback_add(popup, EEXT_CALLBACK_BACK, eext_popup_back_cb, win); if (!strcmp(info->style, "default")) { elm_object_part_text_set(popup, "title,text", header); @@ -197,29 +210,18 @@ void _create_syspopup(const char *id, char *style, const char *status, app_contr elm_popup_align_set(popup, ELM_NOTIFY_ALIGN_FILL, 1.0); evas_object_event_callback_add(popup, EVAS_CALLBACK_DEL, __default_popup_del_cb, info); + evas_object_data_set(popup, "app-control", svc); if (info->left_btn != NULL) { - left_btn = elm_button_add(popup); - elm_object_style_set(left_btn, "popup"); - elm_object_text_set(left_btn, __(info->left_btn)); - elm_object_part_content_set(popup, "button1", left_btn); - - evas_object_data_set(popup, "app-control", svc); - evas_object_smart_callback_add(left_btn, "clicked", __cancel_btn_cb, popup); - - /*add home key callback*/ ecore_event_handler_add(ECORE_EVENT_KEY_DOWN, __home_key_cb, popup); - } - - if (info->right_btn != NULL) { - right_btn = elm_button_add(popup); - elm_object_style_set(right_btn, "popup"); - elm_object_text_set(right_btn, __(info->right_btn)); - elm_object_part_content_set(popup, "button2", right_btn); + __create_popup_btn(popup, "button1", info->left_btn, __cancel_btn_cb); + __create_popup_btn(popup, "button2", info->right_btn, __ok_btn_cb); + } else { + __create_popup_btn(popup, "button1", info->right_btn, __ok_btn_cb); - evas_object_data_set(right_btn, "target", popup); - evas_object_smart_callback_add(right_btn, "clicked", __ok_btn_cb, svc); + eext_object_event_callback_del(popup, EEXT_CALLBACK_BACK, eext_popup_back_cb); + eext_win_keygrab_set(win, "XF86Home"); } } else { elm_object_text_set(popup, body); @@ -230,7 +232,6 @@ void _create_syspopup(const char *id, char *style, const char *status, app_contr evas_object_event_callback_add(popup, EVAS_CALLBACK_DEL, __popup_del_cb, NULL); } - eext_object_event_callback_add(popup, EEXT_CALLBACK_BACK, eext_popup_back_cb, win); evas_object_show(popup); return; -- 2.7.4