tizen 2.4 release

[apps/home/settings.git] / setting-security / src / setting-security.c

diff --git a/setting-security/src/setting-security.c b/setting-security/src/setting-security.c
index 56bad4b..c6713de 100644 (file)
--- a/setting-security/src/setting-security.c
+++ b/setting-security/src/setting-security.c
@@ -1,5 +1,5 @@
 /*
- * setting
+  setting
  *
  * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd.
  *
@@ -22,7 +22,7 @@
 #include <setting-security.h>
 #include <setting-cfg.h>
 
-#include <efl_assist.h>
+#include <efl_extension.h>
 #include <Ecore_X.h>
 #include <utilX.h>
 #include <app_manager.h>
@@ -30,6 +30,7 @@
 #include <ode.h>
 #endif
 #include <sys/wait.h>
+#include <bundle_internal.h>
 
 
 #define Max_Passwd_View_Type_Len       64
@@ -130,7 +131,7 @@ int pwd_handler_sec_pw_simple_passwd(SettingSecurityUG *data, void *arg)
        if (!safeStrCmp(ad->selected_lock_type, Keystr_FaceAndVoice)) {
                lock_type = SETTING_SCREEN_LOCK_TYPE_FACE_AND_VOICE;
                setting_create_guild_layout(ad->navi_bar, Setup_Face_Unlock_Str,
-                                           _("IDS_COM_SK_DONE"), NULL, NULL,
+                                           _("IDS_SA_BUTTON_DONE_ABB"), NULL, NULL,
                                            __face_voice_done_cb, NULL, NULL,
                                            _(Finish_Setup_Face),
                                            NULL, NULL, NULL, NULL, ad);
@@ -207,9 +208,9 @@ int pwd_handler_sec_pw_change_pin1(SettingSecurityUG *data, void *arg)
        SETTING_TRACE_BEGIN;
        SettingSecurityUG *ad = (SettingSecurityUG *)data;
 
-       setting_create_popup_without_btn(ad, ad->ly_main, NULL, _("IDS_ST_POP_PIN_CHANGED"),
+       setting_create_popup(ad, ad->ly_main, NULL, "IDS_ST_POP_PIN_CHANGED",
                                         NULL,
-                                        POPUP_INTERVAL, FALSE, FALSE);
+                                        POPUP_INTERVAL, FALSE, FALSE, 0);
        return 0;
 }
 
@@ -290,18 +291,18 @@ int pwd_handler_sec_pw_pin1_blocked(SettingSecurityUG *data, void *arg)
        ecore_x_netwm_window_type_set(xwin, ECORE_X_WINDOW_TYPE_NOTIFICATION);
        utilx_set_system_notification_level(disp, xwin, UTILX_NOTIFICATION_LEVEL_LOW);
 
-       ret = utilx_grab_key(disp, xwin, KEY_BACK, EXCLUSIVE_GRAB);
+       ret = eext_win_keygrab_set(xwin, "XF86Back");
        if (ret)
-               SETTING_TRACE("utilx_grab_key() failed.");
-       ret = utilx_grab_key(disp, xwin, KEY_HOME, EXCLUSIVE_GRAB);
+               SETTING_TRACE("eext_win_keygrab_set() failed.");
+       ret = eext_win_keygrab_set(xwin, "XF86Home");
        if (ret)
-               SETTING_TRACE("utilx_grab_key() failed.");
-       ret = utilx_grab_key(disp, xwin, KEY_VOLUMEUP, TOP_POSITION_GRAB);
+               SETTING_TRACE("eext_win_keygrab_set() failed.");
+       ret = eext_win_keygrab_set(xwin, "XF86AudioRaiseVolume");
        if (ret)
-               SETTING_TRACE("utilx_grab_key() failed.");
-       ret = utilx_grab_key(disp, xwin, KEY_VOLUMEDOWN, TOP_POSITION_GRAB);
+               SETTING_TRACE("eext_win_keygrab_set() failed.");
+       ret = eext_win_keygrab_set(xwin, "XF86AudioLowerVolume");
        if (ret)
-               SETTING_TRACE("utilx_grab_key() failed.");
+               SETTING_TRACE("eext_win_keygrab_set() failed.");
 
        unsigned int val[3];
        val[0] = 0;     /* always enable F */
@@ -312,12 +313,12 @@ int pwd_handler_sec_pw_pin1_blocked(SettingSecurityUG *data, void *arg)
        ATOM_PANEL_SCROLLABLE_STATE = ecore_x_atom_get("_E_MOVE_PANEL_SCROLLABLE_STATE");
        ecore_x_window_prop_card32_set(xwin, ATOM_PANEL_SCROLLABLE_STATE, val, 3);
 
-       ad->sim_popup = setting_create_popup_with_btn(ad, ad->win_get, NULL,
-                                                     popup_text,
-                                                     setting_security_pin1_blocked_resp_cb,
-                                                     0, 1,
-                                                     "IDS_COM_SK_OK");
-       ea_object_event_callback_del(ad->sim_popup, EA_CALLBACK_BACK, ea_popup_back_cb_2);
+       ad->sim_popup = setting_create_popup(ad, ad->win_get, NULL,
+                                            popup_text,
+                                            setting_security_pin1_blocked_resp_cb,
+                                            0, FALSE, FALSE,
+                                                                                1, "IDS_ST_BUTTON_OK");
+       eext_object_event_callback_del(ad->sim_popup, EEXT_CALLBACK_BACK, setting_popup_del_cb);
 
        /* End. */
        return 0;
@@ -341,10 +342,10 @@ int pwd_handler_sec_pw_pin2_blocked(SettingSecurityUG *data, void *arg)
        char popup_text[2048] = {0,};
        snprintf(popup_text, 2048, "%s", _("IDS_ST_POP_PIN2_BLOCKED"));
 
-       setting_create_popup_without_btn(ad, ad->win_get, NULL,
+       setting_create_popup(ad, ad->win_get, NULL,
                                         popup_text,
                                         NULL,
-                                        2, FALSE, FALSE);
+                                        2, FALSE, FALSE, 0);
 
        ad->pin2_blocked_flag = TRUE;
        setting_view_update(&setting_view_security_sim_settings, ad);
@@ -484,12 +485,12 @@ static void *setting_security_ug_on_create(ui_gadget_h ug,
        /* register view node table */
        setting_view_node_table_intialize();
 
-       setting_create_Gendial_itc("1line", &(securityUG->itc_1text));
+       setting_create_Gendial_itc(SETTING_GENLIST_ICON_1LINE_STYLE, &(securityUG->itc_1text));
+       setting_create_Gendial_itc(SETTING_GENLIST_ICON_1LINE_STYLE, &(securityUG->itc_1text_1icon));
+       setting_create_Gendial_itc(SETTING_GENLIST_GROUP_INDEX_STYLE, &(securityUG->itc_group_item));
        setting_create_Gendial_itc("multiline_sub", &(securityUG->itc_bg_1icon));
-       setting_create_Gendial_itc("2line.top", &(securityUG->itc_2text_2));
-       setting_create_Gendial_itc("1line", &(securityUG->itc_1text_1icon));
-       setting_create_Gendial_itc("groupindex", &(securityUG->itc_group_item));
-       setting_create_Gendial_itc("2line.top", &(securityUG->itc_2text_3_parent));
+       setting_create_Gendial_itc(SETTING_GENLIST_2LINE_STYLE, &(securityUG->itc_2text_2));
+       setting_create_Gendial_itc(SETTING_GENLIST_2LINE_STYLE, &(securityUG->itc_2text_3_parent));
 
        securityUG->update_view_timer = NULL;
        securityUG->remove_sim_popup_timer = NULL;
@@ -542,18 +543,18 @@ static void setting_security_ug_on_pause(ui_gadget_h ug, app_control_h service,
 
                        ecore_x_netwm_window_type_set(xwin, ECORE_X_WINDOW_TYPE_NORMAL);
                        int ret;
-                       ret = utilx_ungrab_key(disp, xwin, KEY_BACK);
+                       ret = eext_win_keygrab_unset(xwin, "XF86Back");
                        if (ret)
-                               SETTING_TRACE("utilx_ungrab_key() failed.");
-                       ret = utilx_ungrab_key(disp, xwin, KEY_HOME);
+                               SETTING_TRACE("eext_win_keygrab_unset() failed.");
+                       ret = eext_win_keygrab_unset(xwin, "XF86Home");
                        if (ret)
-                               SETTING_TRACE("utilx_ungrab_key() failed.");
-                       ret = utilx_ungrab_key(disp, xwin, KEY_VOLUMEUP);
+                               SETTING_TRACE("eext_win_keygrab_unset() failed.");
+                       ret = eext_win_keygrab_unset(xwin, "XF86AudioRaiseVolume");
                        if (ret)
-                               SETTING_TRACE("utilx_ungrab_key() failed.");
-                       ret = utilx_ungrab_key(disp, xwin, KEY_VOLUMEDOWN);
+                               SETTING_TRACE("eext_win_keygrab_unset() failed.");
+                       ret = eext_win_keygrab_unset(xwin, "XF86AudioLowerVolume");
                        if (ret)
-                               SETTING_TRACE("utilx_ungrab_key() failed.");
+                               SETTING_TRACE("eext_win_keygrab_unset() failed.");
 
                        unsigned int val[3];
                        val[0] = 1;     /* always enable */
@@ -892,16 +893,16 @@ void setting_security_end_password_ug_cb(ui_gadget_h ug,
                disp = ecore_x_display_get();
                xwin = elm_win_xwindow_get((Evas_Object *)ug_get_window());
 
-               ret = utilx_ungrab_key(disp, xwin, KEY_BACK);
+               ret = eext_win_keygrab_unset(xwin, "XF86Back");
                if (ret)
                        SETTING_TRACE("KEY_BACK ungrab failed.");
-               ret = utilx_ungrab_key(disp, xwin, KEY_SELECT);
+               ret = eext_win_keygrab_unset(xwin, "XF86Home");
                if (ret)
-                       SETTING_TRACE("KEY_SELECT ungrab failed.");
-               ret = utilx_ungrab_key(disp, xwin, KEY_VOLUMEUP);
+                       SETTING_TRACE("XF86Home ungrab failed.");
+               ret = eext_win_keygrab_unset(xwin, "XF86AudioRaiseVolume");
                if (ret)
                        SETTING_TRACE("KEY_VOLUMEUP ungrab failed.");
-               ret = utilx_ungrab_key(disp, xwin, KEY_VOLUMEDOWN);
+               ret = eext_win_keygrab_unset(xwin, "XF86AudioLowerVolume");
                if (ret)
                        SETTING_TRACE("KEY_VOLUMEDOWN ungrab failed.");
        }