Password module

- fix missing style for password entry

Change-Id: I8af680da39d5d7d14152e63c8742c8346a8341f8
Signed-off-by: Radek Kintop <r.kintop@samsung.com>

diff --git a/setting-password/include/setting-password.h b/setting-password/include/setting-password.h
index 83d627bda1941c4f95c9ad5a4c3fce902f14246b..42544ca683845c4fd8764306938c1121bcf1fafe 100644 (file)
--- a/setting-password/include/setting-password.h
+++ b/setting-password/include/setting-password.h
@@ -218,6 +218,7 @@ typedef struct _SettingPassword {
        Elm_Genlist_Item_Class itc_variable_height;
        Elm_Genlist_Item_Class itc_layout;
        Elm_Genlist_Item_Class itc_group_item;
+       Elm_Genlist_Item_Class itc_editfield;
        int disable_item_type;
 
        unsigned int remain_attempt;

diff --git a/setting-password/src/setting-password-normal.c b/setting-password/src/setting-password-normal.c
index 51a1bd1ea00b45b22361844336cd463a4b8b90c1..5a6add46cdf686a81dacebabf57c14db4c04ff6c 100644 (file)
--- a/setting-password/src/setting-password-normal.c
+++ b/setting-password/src/setting-password-normal.c
@@ -416,7 +416,7 @@ int _draw_1line_password(void *data, void *cb)
        case SETTING_PW_TYPE_PASSWORD:
                ad->ed_pw1 = setting_create_Gendial_field_editfield(
                                ad->md.genlist,
-                               &(itc_editfield),
+                               &(ad->itc_editfield),
                                NULL,
                                ad,
                                SWALLOW_Type_LAYOUT_EDITFIELD,
@@ -450,7 +450,7 @@ int _draw_1line_password(void *data, void *cb)
        case SETTING_PW_TYPE_SET_PASSWORD:
                ad->ed_pw1 = setting_create_Gendial_field_editfield(
                                ad->md.genlist,
-                               &(itc_editfield),
+                               &(ad->itc_editfield),
                                NULL,
                                ad,
                                SWALLOW_Type_LAYOUT_EDITFIELD,

diff --git a/setting-password/src/setting-password-sim.c b/setting-password/src/setting-password-sim.c
index 54c2a599d175a039682fe43f6b8c3f818b6c136b..cf24e40d27e8216703387b760b477cc403a24ed4 100644 (file)
--- a/setting-password/src/setting-password-sim.c
+++ b/setting-password/src/setting-password-sim.c
@@ -654,7 +654,7 @@ int setting_password_sim_draw_1line_entry(void *data, void *cb)
        switch (ad->view_type) {
        case SETTING_PW_TYPE_SIM_LOCK_OFF:
                ad->ed_pw1 = setting_create_Gendial_field_editfield(
-                               ad->md.genlist, &(itc_editfield),
+                               ad->md.genlist, &(ad->itc_editfield),
                                NULL, ad, SWALLOW_Type_LAYOUT_EDITFIELD,
                                "IDS_ST_BODY_SIM_PASSWORD",
                                NULL, setting_password_sim_entry_changed_cb,
@@ -669,7 +669,7 @@ int setting_password_sim_draw_1line_entry(void *data, void *cb)
        case SETTING_PW_TYPE_PIN_LOCK_ON:
        case SETTING_PW_TYPE_PIN_LOCK_OFF:
                ad->ed_pw1 = setting_create_Gendial_field_editfield(
-                               ad->md.genlist, &(itc_editfield),
+                               ad->md.genlist, &(ad->itc_editfield),
                                NULL, ad, SWALLOW_Type_LAYOUT_EDITFIELD,
                                "IDS_ST_BODY_PIN", NULL,
                                setting_password_sim_entry_changed_cb,
@@ -685,7 +685,7 @@ int setting_password_sim_draw_1line_entry(void *data, void *cb)
                break;
        case SETTING_PW_TYPE_PIN_BLOCKED:
                ad->ed_pw1 = setting_create_Gendial_field_editfield(
-                               ad->md.genlist, &(itc_editfield),
+                               ad->md.genlist, &(ad->itc_editfield),
                                NULL, ad, SWALLOW_Type_LAYOUT_EDITFIELD,
                                "IDS_ST_BODY_PUK1_CODE",
                                NULL, setting_password_sim_entry_changed_cb,
@@ -699,7 +699,7 @@ int setting_password_sim_draw_1line_entry(void *data, void *cb)
        case SETTING_PW_TYPE_CHANGE_PIN:
        case SETTING_PW_TYPE_CHANGE_PIN2:
                ad->ed_pw1 = setting_create_Gendial_field_editfield(
-                               ad->md.genlist, &(itc_editfield),
+                               ad->md.genlist, &(ad->itc_editfield),
                                NULL, ad, SWALLOW_Type_LAYOUT_EDITFIELD,
                                PW_SHORT_GUIDE_CURRENT,
                                NULL, setting_password_sim_entry_changed_cb,
@@ -753,7 +753,7 @@ int setting_password_sim_draw_2line_entry(void *data, void *cb)
        switch (ad->view_type) {
        case SETTING_PW_TYPE_SIM_LOCK_ON:
                ad->ed_pw1 = setting_create_Gendial_field_editfield(
-                               ad->md.genlist, &(itc_editfield),
+                               ad->md.genlist, &(ad->itc_editfield),
                                NULL, ad, SWALLOW_Type_LAYOUT_EDITFIELD,
                                PW_SHORT_GUIDE_NEW,
                                NULL, setting_password_sim_entry_changed_cb,
@@ -765,7 +765,7 @@ int setting_password_sim_draw_2line_entry(void *data, void *cb)
                                NULL);
 
                ad->ed_pw2 = setting_create_Gendial_field_editfield(
-                               ad->md.genlist, &(itc_editfield),
+                               ad->md.genlist, &(ad->itc_editfield),
                                NULL, ad, SWALLOW_Type_LAYOUT_EDITFIELD,
                                PW_SHORT_GUIDE_CONFIRM,
                                NULL, setting_password_sim_entry_changed_cb,
@@ -780,7 +780,7 @@ int setting_password_sim_draw_2line_entry(void *data, void *cb)
        case SETTING_PW_TYPE_CHANGE_PIN:
        case SETTING_PW_TYPE_CHANGE_PIN2:
                ad->ed_pw1 = setting_create_Gendial_field_editfield(
-                               ad->md.genlist, &(itc_editfield),
+                               ad->md.genlist, &(ad->itc_editfield),
                                NULL, ad, SWALLOW_Type_LAYOUT_EDITFIELD,
                                PW_SHORT_GUIDE_NEW,
                                NULL, setting_password_sim_entry_changed_cb,
@@ -795,7 +795,7 @@ int setting_password_sim_draw_2line_entry(void *data, void *cb)
                                        _("IDS_ST_HEADER_ENTER_PIN_ABB3"));
 
                ad->ed_pw2 = setting_create_Gendial_field_editfield(
-                               ad->md.genlist, &(itc_editfield),
+                               ad->md.genlist, &(ad->itc_editfield),
                                NULL, ad, SWALLOW_Type_LAYOUT_EDITFIELD,
                                PW_SHORT_GUIDE_CONFIRM,
                                NULL, setting_password_sim_entry_changed_cb,
@@ -853,7 +853,7 @@ int setting_password_sim_draw_3line_entry(void *data, void *cb)
        switch (ad->view_type) {
        case SETTING_PW_TYPE_PIN_BLOCKED:
                ad->ed_pw1 = setting_create_Gendial_field_editfield(
-                               ad->md.genlist, &(itc_editfield),
+                               ad->md.genlist, &(ad->itc_editfield),
                                NULL, ad, SWALLOW_Type_LAYOUT_EDITFIELD,
                                "IDS_ST_BODY_PUK1_CODE",
                                NULL, setting_password_sim_entry_changed_cb,
@@ -865,7 +865,7 @@ int setting_password_sim_draw_3line_entry(void *data, void *cb)
                                NULL);
 
                ad->ed_pw2 = setting_create_Gendial_field_editfield(
-                               ad->md.genlist, &(itc_editfield),
+                               ad->md.genlist, &(ad->itc_editfield),
                                NULL, ad, SWALLOW_Type_LAYOUT_EDITFIELD,
                                "IDS_ST_BODY_NEW_PIN1",
                                NULL, setting_password_sim_entry_changed_cb,
@@ -877,7 +877,7 @@ int setting_password_sim_draw_3line_entry(void *data, void *cb)
                                NULL);
 
                ad->ed_pw3 = setting_create_Gendial_field_editfield(
-                               ad->md.genlist, &(itc_editfield),
+                               ad->md.genlist, &(ad->itc_editfield),
                                NULL, ad, SWALLOW_Type_LAYOUT_EDITFIELD,
                                "IDS_ST_BODY_CONFIRM_NEW_PIN1",
                                NULL, setting_password_sim_entry_changed_cb,
@@ -890,7 +890,7 @@ int setting_password_sim_draw_3line_entry(void *data, void *cb)
                break;
        case SETTING_PW_TYPE_PIN2_BLOCKED:
                ad->ed_pw1 = setting_create_Gendial_field_editfield(
-                               ad->md.genlist, &(itc_editfield),
+                               ad->md.genlist, &(ad->itc_editfield),
                                NULL, ad, SWALLOW_Type_LAYOUT_EDITFIELD,
                                "IDS_ST_BODY_PUK2", NULL,
                                setting_password_sim_entry_changed_cb,
@@ -902,7 +902,7 @@ int setting_password_sim_draw_3line_entry(void *data, void *cb)
                                NULL);
 
                ad->ed_pw2 = setting_create_Gendial_field_editfield(
-                               ad->md.genlist, &(itc_editfield),
+                               ad->md.genlist, &(ad->itc_editfield),
                                NULL, ad, SWALLOW_Type_LAYOUT_EDITFIELD,
                                "IDS_ST_BODY_NEW_PIN2",
                                NULL, setting_password_sim_entry_changed_cb,
@@ -914,7 +914,7 @@ int setting_password_sim_draw_3line_entry(void *data, void *cb)
                                NULL);
 
                ad->ed_pw3 = setting_create_Gendial_field_editfield(
-                               ad->md.genlist, &(itc_editfield),
+                               ad->md.genlist, &(ad->itc_editfield),
                                NULL, ad, SWALLOW_Type_LAYOUT_EDITFIELD,
                                "IDS_ST_BODY_CONFIRM_NEW_PIN2",
                                NULL, setting_password_sim_entry_changed_cb,

diff --git a/setting-password/src/setting-password.c b/setting-password/src/setting-password.c
index 9ce1ab9c77065c980c223f964915deae4142673b..ddfe5cb6b690b135697f6b55352b728c57ab3a55 100644 (file)
--- a/setting-password/src/setting-password.c
+++ b/setting-password/src/setting-password.c
@@ -353,11 +353,13 @@ static bool on_app_create(void *priv)
        evas_object_smart_callback_add(ad->md.window, "wm,rotation,changed",
                        setting_password_rotated_cb, ad);
 
-       elm_theme_extension_add(NULL, SETTING_GENLIST_EDJ_NAME);
+       elm_theme_extension_add(NULL, EDJDIR"/gl-item-entry-main.edj");
        setting_create_Gendial_itc(SETTING_GENLIST_GROUP_INDEX_STYLE,
                        &(ad->itc_title));
        setting_create_Gendial_itc(SETTING_GENLIST_1ICON_STYLE,
                        &(ad->itc_variable_height));
+       setting_create_Gendial_itc("entry.main",
+                               &(ad->itc_editfield));
 
        ad->itc_err_desc.item_style = "multiline_sub";
        ad->itc_err_desc.func.text_get = __gl_err_desc_text_get;