fix N_SE-9899, N_SE-10070 : auto capitalization is working at email signature field...

diff --git a/setting/src/email-view-account-edit.c b/setting/src/email-view-account-edit.c
index 9bcdba2..9caf9bd 100755 (executable)
--- a/setting/src/email-view-account-edit.c
+++ b/setting/src/email-view-account-edit.c
@@ -441,10 +441,27 @@ static void _push_naviframe(struct viewdata *vd)
        evas_object_smart_callback_add(p->r_button2, "clicked", _save_cb, vd);
        evas_object_show(p->r_button2);*/
 
+       Evas_Object *title_ic = elm_icon_add(vd->ugd->navi_bar);
+       evas_object_size_hint_aspect_set(title_ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
+       elm_icon_resizable_set(title_ic, EINA_TRUE, EINA_TRUE);
+
+       account_user_data_t *user_data = (account_user_data_t *)account_data->user_data;
+
+       if (user_data->is_preset_account == GMAIL) {
+               elm_icon_file_set(title_ic, ACCOUNT_ICON_GMAIL, NULL);
+       } else if (user_data->is_preset_account == HOTMAIL) {
+               elm_icon_file_set(title_ic, ACCOUNT_ICON_HOTMAIL, NULL);
+       } else if (user_data->is_preset_account == YAHOOMAIL) {
+               elm_icon_file_set(title_ic, ACCOUNT_ICON_YAHOO, NULL);
+       } else if (user_data->is_preset_account == AOL) {
+               elm_icon_file_set(title_ic, ACCOUNT_ICON_AOL, NULL);
+       }
+
        Elm_Object_Item *navi_it = NULL;
        navi_it = elm_naviframe_item_push(vd->ugd->navi_bar, p->str_account_name, p->l_button, NULL, p->layout, NULL);
        /*elm_object_item_part_content_set(navi_it, "title_left_btn", p->r_button1);
        elm_object_item_part_content_set(navi_it, "title_right_btn", p->r_button2);*/
+       elm_object_item_part_content_set(navi_it, "icon", title_ic);
        elm_object_item_part_content_set(navi_it, "controlbar", p->cbar);
        evas_object_show(vd->ugd->navi_bar);
 }

diff --git a/setting/src/email-view-account-options.c b/setting/src/email-view-account-options.c
index 9d40584..86e2668 100755 (executable)
--- a/setting/src/email-view-account-options.c
+++ b/setting/src/email-view-account-options.c
@@ -905,7 +905,7 @@ static char *_gl_onoff_text_get_cb(void *data, Evas_Object *obj, const char *par
                }
 
                if (index == 6) {
-                       snprintf(buf, sizeof(buf), "%s", N_("Send read report"));
+                       snprintf(buf, sizeof(buf), "%s", _("IDS_EMAIL_BODY_SEND_READ_REPORT"));
                }
 
                return g_strdup(buf);

diff --git a/setting/src/email-view-account-setup.c b/setting/src/email-view-account-setup.c
index d7acf20..e1b8664 100755 (executable)
--- a/setting/src/email-view-account-setup.c
+++ b/setting/src/email-view-account-setup.c
@@ -35,6 +35,8 @@ static int _check_null_field(struct viewdata *vd);
 static int _check_preset_null_field(struct viewdata *vd);
 static int _check_preset_isp_name(char *addr, int isp_type);
 static void _read_all_entries(struct viewdata *vd);
+/*static void _set_help_string(Evas_Object *eo, struct viewdata *vd);*/
+static void _set_domain_string(struct viewdata *vd);
 
 static void _next_cb(void *data, Evas_Object *obj, void *event_info);
 static void _save_cb(void *data, Evas_Object *obj, void *event_info);
@@ -42,8 +44,8 @@ static void _manual_cb(void *data, Evas_Object *obj, void *event_info);
 static void _back_cb(void *data, Evas_Object *obj, void *event_info);
 static void _check1_clicked_cb(void *data, Evas_Object *obj, void *event_info);
 static void _check2_clicked_cb(void *data, Evas_Object *obj, void *event_info);
-static void _check1_clicked_cb2(void *data, Evas * evas, Evas_Object *obj, void *event_info);
-static void _check2_clicked_cb2(void *data, Evas * evas, Evas_Object *obj, void *event_info);
+static void _check1_clicked_cb2(void *data, Evas_Object *obj, const char *emission, const char *source);
+static void _check2_clicked_cb2(void *data, Evas_Object *obj, const char *emission, const char *source);
 static Eina_Bool _after_validation_cb(void *data);
 
 static void _popup_ok_cb(void *data, Evas_Object *obj, void *event_info);
@@ -224,6 +226,10 @@ static int _create(struct viewdata *vd)
        g_vd = vd;
        ugd->wds_account_creation = 0;
 
+       if (vd->ugd->account_info != OTHERS) {
+               _set_domain_string(vd);
+       }
+
        _create_view(vd);
        vd->refresh = 1;
 
@@ -405,9 +411,10 @@ static void _create_view(struct viewdata *vd)
 
        char *desc = g_strdup(_("IDS_EMAIL_BODY_SEND_EMAIL_FROM_THIS_ACCOUNT_BY_DEFAULT"));
        Evas_Object *label1 = elm_label_add(checkbox_set);
-       char *text = g_strconcat("<color=#838B8BFF><font_size=30><align=left>",
+       char *text = g_strconcat("<color=#838B8BFF><font_size=32><align=left>",
                                desc, "</align></font_size></color>", NULL);
-       evas_object_event_callback_add(label1, EVAS_CALLBACK_MOUSE_UP, _check1_clicked_cb2, (void *)vd);
+       edje_object_signal_callback_add(elm_layout_edje_get(checkbox_set),
+                       "elm,action,text1_clicked", "elm", _check1_clicked_cb2, (void *)vd);
        elm_object_text_set(label1, text);
        evas_object_show(label1);
        g_free(desc);
@@ -416,9 +423,10 @@ static void _create_view(struct viewdata *vd)
 
        desc = g_strdup(_("IDS_EMAIL_BODY_SHOW_PASSWORD"));
        Evas_Object *label2 = elm_label_add(checkbox_set);
-       text = g_strconcat("<color=#838B8BFF><font_size=30><align=left>",
+       text = g_strconcat("<color=#838B8BFF><font_size=32><align=left>",
                                desc, "</align></font_size></color>", NULL);
-       evas_object_event_callback_add(label2, EVAS_CALLBACK_MOUSE_UP, _check2_clicked_cb2, (void *)vd);
+       edje_object_signal_callback_add(elm_layout_edje_get(checkbox_set),
+                       "elm,action,text2_clicked", "elm", _check2_clicked_cb2, (void *)vd);
        elm_object_text_set(label2, text);
        evas_object_show(label2);
        g_free(desc);
@@ -432,17 +440,6 @@ static void _create_view(struct viewdata *vd)
        evas_object_size_hint_weight_set(button_set, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        evas_object_show(button_set);
 
-       desc = g_strdup(N_("Setup POP3 or IMAP4?"));
-       Evas_Object *label3 = elm_label_add(button_set);
-       text = g_strconcat("<color=#838B8BFF><font_size=30><align=left>",
-                               desc, "</align></font_size></color>", NULL);
-
-       elm_object_text_set(label3, text);
-       evas_object_show(label3);
-       g_free(desc);
-       g_free(text);
-       elm_object_part_content_set(button_set, "text", label3);
-
        Evas_Object *btn = elm_button_add(button_set);
        elm_object_text_set(btn, _("IDS_EMAIL_BODY_MANUAL_SETUP"));
        evas_object_smart_callback_add(btn, "clicked", _manual_cb, (void *)vd);
@@ -734,6 +731,26 @@ static void _read_all_entries(struct viewdata *vd)
        }
 }
 
+static void _set_domain_string(struct viewdata *vd)
+{
+       debug_log("");
+       EmailSettingUGD *ugd = vd->ugd;
+       struct priv_data *p;
+       p = vd->priv;
+
+       if (ugd->account_info == HOTMAIL) {
+               p->str_email_address = g_strdup("@hotmail.com");
+       } else if (ugd->account_info == YAHOOMAIL) {
+               p->str_email_address = g_strdup("@yahoo.com");
+       } else if (ugd->account_info == GMAIL) {
+               p->str_email_address = g_strdup("@gmail.com");
+       } else if (ugd->account_info == AOL) {
+               p->str_email_address = g_strdup("@aol.com");
+       } else {
+               debug_log("Unknown account type");
+       }
+}
+
 static void _next_cb(void *data, Evas_Object *obj, void *event_info)
 {
        debug_log("");
@@ -1047,7 +1064,7 @@ static void _check1_clicked_cb(void *data, Evas_Object *obj, void *event_info)
                p->set_default_account = 0;
 }
 
-static void _check1_clicked_cb2(void *data, Evas * evas, Evas_Object *obj, void *event_info)
+static void _check1_clicked_cb2(void *data, Evas_Object *obj, const char *emission, const char *source)
 {
        debug_log("");
        struct viewdata *vd = (struct viewdata *)data;
@@ -1088,7 +1105,7 @@ static void _check2_clicked_cb(void *data, Evas_Object *obj, void *event_info)
                elm_entry_password_set(p->entry_password, EINA_TRUE);
 }
 
-static void _check2_clicked_cb2(void *data, Evas * evas, Evas_Object *obj, void *event_info)
+static void _check2_clicked_cb2(void *data, Evas_Object *obj, const char *emission, const char *source)
 {
        debug_log("");
        struct viewdata *vd = (struct viewdata *)data;
@@ -1533,10 +1550,20 @@ static Evas_Object *_gl_ef_content_get_cb(void *data, Evas_Object *obj, const ch
                        if (p->str_email_address)
                                elm_entry_entry_set(p->entry_email_address, p->str_email_address);
 
-                       if (ugd->account_info != OTHERS && p->icon_get_cnt2 == 2) {
+                       if (ugd->account_info != OTHERS && p->icon_get_cnt2 == 2 &&
+                                       strcmp(ugd->start_view_type, EMAIL_BUNDLE_VAL_VIEW_ACCOUNT_ADD) != 0) {
+                               p->clicked_object = p->entry_email_address;
+                               evas_object_show(p->entry_email_address);
+                               elm_object_focus_set(p->entry_email_address, EINA_TRUE);
+                               elm_entry_cursor_begin_set(p->entry_email_address);
+                       }
+
+                       if (ugd->account_info != OTHERS && p->icon_get_cnt2 == 3 &&
+                                       strcmp(ugd->start_view_type, EMAIL_BUNDLE_VAL_VIEW_ACCOUNT_ADD) == 0) {
                                p->clicked_object = p->entry_email_address;
                                evas_object_show(p->entry_email_address);
                                elm_object_focus_set(p->entry_email_address, EINA_TRUE);
+                               elm_entry_cursor_begin_set(p->entry_email_address);
                        }
 
                        return p->ef_email_address;

diff --git a/setting/src/email-view-manual-setup.c b/setting/src/email-view-manual-setup.c
index 226814e..9676269 100755 (executable)
--- a/setting/src/email-view-manual-setup.c
+++ b/setting/src/email-view-manual-setup.c
@@ -351,9 +351,29 @@ static void _push_naviframe(struct viewdata *vd)
        elm_object_style_set(p->l_button2, "naviframe/back_btn/default");
        evas_object_show(p->l_button2);
 
+       Evas_Object *title_ic = elm_icon_add(vd->ugd->navi_bar);
+       evas_object_size_hint_aspect_set(title_ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
+       elm_icon_resizable_set(title_ic, EINA_TRUE, EINA_TRUE);
+
+       char title_str[50] = { 0, };
+       if (vd->ugd->account_info == GMAIL) {
+               snprintf(title_str, sizeof(title_str), "%s", dgettext("sys_string", "IDS_COM_BODY_GOOGLE"));
+               elm_icon_file_set(title_ic, ACCOUNT_ICON_GMAIL, NULL);
+       } else if (vd->ugd->account_info == HOTMAIL) {
+               snprintf(title_str, sizeof(title_str), "%s", _("IDS_EMAIL_BODY_WINDOWS_LIVE_HOTMAIL"));
+               elm_icon_file_set(title_ic, ACCOUNT_ICON_HOTMAIL, NULL);
+       } else if (vd->ugd->account_info == YAHOOMAIL) {
+               snprintf(title_str, sizeof(title_str), "%s", _("IDS_EMAIL_BODY_YAHOO_E_MAIL"));
+               elm_icon_file_set(title_ic, ACCOUNT_ICON_YAHOO, NULL);
+       } else if (vd->ugd->account_info == AOL) {
+               snprintf(title_str, sizeof(title_str), "%s", _("IDS_EMAIL_BODY_AOL"));
+               elm_icon_file_set(title_ic, ACCOUNT_ICON_AOL, NULL);
+       } else
+               snprintf(title_str, sizeof(title_str), "%s", dgettext("sys_string", "IDS_COM_BODY_OTHERS"));
+
        Elm_Object_Item *navi_it = NULL;
-       navi_it = elm_naviframe_item_push(vd->ugd->navi_bar,
-                       _("IDS_EMAIL_HEADER_ADD_ACCOUNT"), p->l_button2, NULL, p->layout, NULL);
+       navi_it = elm_naviframe_item_push(vd->ugd->navi_bar, title_str, p->l_button2, NULL, p->layout, NULL);
+       elm_object_item_part_content_set(navi_it, "icon", title_ic);
        elm_object_item_part_content_set(navi_it, "title_left_btn", p->r_button);
        elm_object_item_part_content_set(navi_it, "title_right_btn", p->l_button);
        evas_object_show(vd->ugd->navi_bar);

diff --git a/setting/src/email-view-sync-schedule.c b/setting/src/email-view-sync-schedule.c
index 198df28..5f975e4 100755 (executable)
--- a/setting/src/email-view-sync-schedule.c
+++ b/setting/src/email-view-sync-schedule.c
@@ -68,9 +68,9 @@ static void _gl_con_cb(void *data, Evas_Object *obj, void *event_info);
 
 static int sync_schedule[7] = { 0, 30, 60, 180, 360, 720, 1440 };
 
-#define SYNC_STATUS_FINISHED                0        /* BIN 00000000 */
-#define SYNC_STATUS_SYNCING                 1        /* BIN 00000001 */
-#define SYNC_STATUS_HAVE_NEW_MAILS          2        /* BIN 00000010 */
+#define SYNC_STATUS_FINISHED                   0       /* BIN 00000000 */
+#define SYNC_STATUS_SYNCING                    1       /* BIN 00000001 */
+#define SYNC_STATUS_HAVE_NEW_MAILS     2       /* BIN 00000010 */
 
 struct priv_data {
        struct viewdata *vd;
@@ -122,6 +122,11 @@ void setting_schedule_sync_started(struct viewdata *vd, int account_id)
        EmailSettingUGD *ugd = vd->ugd;
        p = vd->priv;
 
+       if (p == NULL) {
+               debug_log("priv is NULL");
+               return;
+       }
+
        if (ugd->account_id != account_id) {
                debug_log("not interested");
                return;
@@ -143,6 +148,11 @@ void setting_schedule_sync_finished(struct viewdata *vd, int account_id)
        EmailSettingUGD *ugd = vd->ugd;
        p = vd->priv;
 
+       if (p == NULL) {
+               debug_log("priv is NULL");
+               return;
+       }
+
        if (ugd->account_id != account_id) {
                debug_log("not interested");
                return;
@@ -332,8 +342,25 @@ static void _push_naviframe(struct viewdata *vd)
        evas_object_smart_callback_add(p->l_button, "clicked", _back_cb, vd);
        elm_object_style_set(p->l_button, "naviframe/back_btn/default");
 
+       Evas_Object *title_ic = elm_icon_add(vd->ugd->navi_bar);
+       evas_object_size_hint_aspect_set(title_ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
+       elm_icon_resizable_set(title_ic, EINA_TRUE, EINA_TRUE);
+
+       account_user_data_t *user_data = (account_user_data_t *)account_data->user_data;
+
+       if (user_data->is_preset_account == GMAIL) {
+               elm_icon_file_set(title_ic, ACCOUNT_ICON_GMAIL, NULL);
+       } else if (user_data->is_preset_account == HOTMAIL) {
+               elm_icon_file_set(title_ic, ACCOUNT_ICON_HOTMAIL, NULL);
+       } else if (user_data->is_preset_account == YAHOOMAIL) {
+               elm_icon_file_set(title_ic, ACCOUNT_ICON_YAHOO, NULL);
+       } else if (user_data->is_preset_account == AOL) {
+               elm_icon_file_set(title_ic, ACCOUNT_ICON_AOL, NULL);
+       }
+
        Elm_Object_Item *navi_it = NULL;
        navi_it = elm_naviframe_item_push(vd->ugd->navi_bar, account_data->account_name, p->l_button, NULL, p->layout, NULL);
+       elm_object_item_part_content_set(navi_it, "icon", title_ic);
        elm_object_item_part_content_set(navi_it, "title_right_btn", p->r_button);
        elm_object_item_part_content_set(navi_it, "controlbar", p->cbar);
        evas_object_show(vd->ugd->navi_bar);
@@ -361,7 +388,7 @@ static void _create_list(struct viewdata *vd)
        p->genlist = elm_genlist_add(ugd->navi_bar);
        elm_object_style_set(p->genlist, "dialogue");
 
-       p->itc_account.item_style = "dialogue/2text.3icon";
+       p->itc_account.item_style = "dialogue/2text.1icon.6";
        p->itc_account.func.text_get = _gl_account_text_get_cb;
        p->itc_account.func.content_get = _gl_account_content_get_cb;
        p->itc_account.func.state_get = NULL;
@@ -902,9 +929,9 @@ static Evas_Object *_gl_account_content_get_cb(void *data, Evas_Object *obj, con
        struct viewdata *vd = g_vd;
        EmailSettingUGD *ugd = vd->ugd;
        struct priv_data *p = vd->priv;
-       Evas_Object *color_bar = NULL;
+       /*Evas_Object *color_bar = NULL;*/
 
-       if (!g_strcmp0(part, "elm.icon.1")) {
+       /*if (!g_strcmp0(part, "elm.icon.1")) {
                Evas_Object *icon = elm_icon_add(ugd->navi_bar);
                account_user_data_t *user_data = (account_user_data_t *)account_data->user_data;
 
@@ -932,9 +959,9 @@ static Evas_Object *_gl_account_content_get_cb(void *data, Evas_Object *obj, con
                evas_object_size_hint_aspect_set(icon, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
                p->account_icon = icon;
                return icon;
-       }
+       }*/
 
-       if (!g_strcmp0(part, "elm.icon.2")) {
+       if (!g_strcmp0(part, "elm.icon")) {
                if (p->syncing) {
                        Evas_Object *pb = elm_progressbar_add(ugd->navi_bar);
                        elm_object_style_set(pb, "list_process_small");
@@ -944,7 +971,7 @@ static Evas_Object *_gl_account_content_get_cb(void *data, Evas_Object *obj, con
                }
        }
 
-       if (!g_strcmp0(part, "elm.swallow.colorbar")) {
+       /*if (!g_strcmp0(part, "elm.swallow.colorbar")) {
                account_user_data_t *user_data = (account_user_data_t *)account_data->user_data;
                unsigned int val = user_data->index_color;
                int r = (val & 0xff000000) >> 24;
@@ -959,7 +986,7 @@ static Evas_Object *_gl_account_content_get_cb(void *data, Evas_Object *obj, con
                evas_object_color_set(color_bar, r, g, b, a);
 
                return color_bar;
-       }
+       }*/
 
        return NULL;
 }

diff --git a/setting/src/email-view-sync-setup.c b/setting/src/email-view-sync-setup.c
index d5a408d..0f68fe2 100755 (executable)
--- a/setting/src/email-view-sync-setup.c
+++ b/setting/src/email-view-sync-setup.c
@@ -122,6 +122,11 @@ void setting_setup_sync_started(struct viewdata *vd, int account_id)
        EmailSettingUGD *ugd = vd->ugd;
        p = vd->priv;
 
+       if (p == NULL) {
+               debug_log("priv is NULL");
+               return;
+       }
+
        if (ugd->account_id != account_id) {
                debug_log("not interested");
                return;
@@ -143,6 +148,11 @@ void setting_setup_sync_finished(struct viewdata *vd, int account_id)
        EmailSettingUGD *ugd = vd->ugd;
        p = vd->priv;
 
+       if (p == NULL) {
+               debug_log("priv is NULL");
+               return;
+       }
+
        if (ugd->account_id != account_id) {
                debug_log("not interested");
                return;
@@ -332,8 +342,25 @@ static void _push_naviframe(struct viewdata *vd)
        evas_object_smart_callback_add(p->l_button, "clicked", _back_cb, vd);
        elm_object_style_set(p->l_button, "naviframe/back_btn/default");
 
+       Evas_Object *title_ic = elm_icon_add(vd->ugd->navi_bar);
+       evas_object_size_hint_aspect_set(title_ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
+       elm_icon_resizable_set(title_ic, EINA_TRUE, EINA_TRUE);
+
+       account_user_data_t *user_data = (account_user_data_t *)account_data->user_data;
+
+       if (user_data->is_preset_account == GMAIL) {
+               elm_icon_file_set(title_ic, ACCOUNT_ICON_GMAIL, NULL);
+       } else if (user_data->is_preset_account == HOTMAIL) {
+               elm_icon_file_set(title_ic, ACCOUNT_ICON_HOTMAIL, NULL);
+       } else if (user_data->is_preset_account == YAHOOMAIL) {
+               elm_icon_file_set(title_ic, ACCOUNT_ICON_YAHOO, NULL);
+       } else if (user_data->is_preset_account == AOL) {
+               elm_icon_file_set(title_ic, ACCOUNT_ICON_AOL, NULL);
+       }
+
        Elm_Object_Item *navi_it = NULL;
        navi_it = elm_naviframe_item_push(vd->ugd->navi_bar, account_data->account_name, p->l_button, NULL, p->layout, NULL);
+       elm_object_item_part_content_set(navi_it, "icon", title_ic);
        elm_object_item_part_content_set(navi_it, "title_right_btn", p->r_button);
        elm_object_item_part_content_set(navi_it, "controlbar", p->cbar);
        evas_object_show(vd->ugd->navi_bar);
@@ -361,7 +388,7 @@ static void _create_list(struct viewdata *vd)
        p->genlist = elm_genlist_add(ugd->navi_bar);
        elm_object_style_set(p->genlist, "dialogue");
 
-       p->itc_account.item_style = "dialogue/2text.3icon";
+       p->itc_account.item_style = "dialogue/2text.1icon.6";
        p->itc_account.func.text_get = _gl_account_text_get_cb;
        p->itc_account.func.content_get = _gl_account_content_get_cb;
        p->itc_account.func.state_get = NULL;
@@ -923,9 +950,9 @@ static Evas_Object *_gl_account_content_get_cb(void *data, Evas_Object *obj, con
        struct viewdata *vd = g_vd;
        EmailSettingUGD *ugd = vd->ugd;
        struct priv_data *p = vd->priv;
-       Evas_Object *color_bar = NULL;
+       /*Evas_Object *color_bar = NULL;*/
 
-       if (!g_strcmp0(part, "elm.icon.1")) {
+       /*if (!g_strcmp0(part, "elm.icon.1")) {
                Evas_Object *icon = elm_icon_add(ugd->navi_bar);
                account_user_data_t *user_data = (account_user_data_t *)account_data->user_data;
 
@@ -953,9 +980,9 @@ static Evas_Object *_gl_account_content_get_cb(void *data, Evas_Object *obj, con
                evas_object_size_hint_aspect_set(icon, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
                p->account_icon = icon;
                return icon;
-       }
+       }*/
 
-       if (!g_strcmp0(part, "elm.icon.2")) {
+       if (!g_strcmp0(part, "elm.icon")) {
                if (p->syncing) {
                        Evas_Object *pb = elm_progressbar_add(ugd->navi_bar);
                        elm_object_style_set(pb, "list_process_small");
@@ -965,7 +992,7 @@ static Evas_Object *_gl_account_content_get_cb(void *data, Evas_Object *obj, con
                }
        }
 
-       if (!g_strcmp0(part, "elm.swallow.colorbar")) {
+       /*if (!g_strcmp0(part, "elm.swallow.colorbar")) {
                account_user_data_t *user_data = (account_user_data_t *)account_data->user_data;
                unsigned int val = user_data->index_color;
                int r = (val & 0xff000000) >> 24;
@@ -980,7 +1007,7 @@ static Evas_Object *_gl_account_content_get_cb(void *data, Evas_Object *obj, con
                evas_object_color_set(color_bar, r, g, b, a);
 
                return color_bar;
-       }
+       }*/
 
        return NULL;
 }

diff --git a/setting/theme/email-setting-theme.edc b/setting/theme/email-setting-theme.edc
index 9e4d008..3e4a46b 100755 (executable)
--- a/setting/theme/email-setting-theme.edc
+++ b/setting/theme/email-setting-theme.edc
@@ -1317,49 +1317,22 @@ collections {
                                repeat_events: 1;
                                scale: 1;
                                description { state: "default" 0.0;
-                                       min: 720 168;
-                                       max: 720 168;
+                                       min: 720 200;
+                                       max: 720 200;
                                        color: 0 0 0 0;
                                        align: 0.0 0.5;
                                }
                        }
 
-                       part { name: "top_padding";
-                               type: RECT;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       min: 0 16;
-                                       fixed: 0 1;
-                                       visible: 0;
-                                       rel1 { to: "base"; relative: 0 0; }
-                                       rel2 { to: "base"; relative: 1 0; offset: 0 16; }
-                                       align: 0.0 0.0;
-                               }
-                       }
-
-                       part { name: "bottom_padding";
-                               type: RECT;
-                               scale: 1;
-                               description { state: "default" 0.0;
-                                       min: 0 16;
-                                       fixed: 0 1;
-                                       visible: 0;
-                                       rel1 { to: "base"; relative: 0 1; offset: 0 -16; }
-                                       rel2 { to: "base"; relative: 1 1; }
-                                       align: 0.0 0.0;
-                               }
-                       }
-
                        part { name: "left_padding";
                                type: RECT;
                                scale: 1;
                                description { state: "default" 0.0;
-                                       min: 20 0;
+                                       min: 16 0;
                                        fixed: 1 0;
                                        visible: 0;
                                        rel1 { to: "base"; relative: 0 0; }
-                                       rel2 { to: "base"; relative: 0 1; offset: 20 0; }
+                                       rel2 { to: "base"; relative: 0 1; }
                                        align: 0.0 0.0;
                                }
                        }
@@ -1368,12 +1341,12 @@ collections {
                                type: RECT;
                                scale: 1;
                                description { state: "default" 0.0;
-                                       min: 20 0;
+                                       min: 16 0;
                                        fixed: 1 0;
                                        visible: 0;
-                                       rel1 { to: "base"; relative: 1 0; offset: -20 0; }
+                                       rel1 { to: "base"; relative: 1 0; }
                                        rel2 { to: "base"; relative: 1 1; }
-                                       align: 0.0 0.0;
+                                       align: 1.0 0.0;
                                }
                        }
 
@@ -1381,20 +1354,20 @@ collections {
                                type: RECT;
                                scale: 1;
                                description { state: "default" 0.0;
-                                       min: 0 68;
+                                       min: 0 100;
                                        fixed: 1 0;
                                        visible: 0;
                                        align: 0.0 0.5;
                                        rel1 {
-                                               relative: 1.0 1.0;
+                                               relative: 1.0 0.0;
                                                to_x: "left_padding";
-                                               to_y: "top_padding";
+                                               to_y: "base";
                                        }
                                        rel2 {
-                                               relative: 0.0 1.0;
-                                               offset: 0 68;
+                                               relative: 0.0 0.0;
+                                               offset: 0 100;
                                                to_x: "right_padding";
-                                               to_y: "top_padding";
+                                               to_y: "base";
                                        }
                                }
                        }
@@ -1403,7 +1376,7 @@ collections {
                                type: RECT;
                                scale: 1;
                                description { state: "default" 0.0;
-                                       min: 0 68;
+                                       min: 0 100;
                                        fixed: 1 0;
                                        visible: 0;
                                        align: 0.0 0.5;
@@ -1413,9 +1386,9 @@ collections {
                                                to_y: "subbox.1";
                                        }
                                        rel2 {
-                                               relative: 0.0 0.0;
+                                               relative: 0.0 1.0;
                                                to_x: "right_padding";
-                                               to_y: "bottom_padding";
+                                               to_y: "base";
                                        }
                                }
                        }
@@ -1445,21 +1418,22 @@ collections {
 
                        part { name: "text.1";
                                type: SWALLOW;
+                               ignore_flags: ON_HOLD;
                                mouse_events: 1;
                                scale: 1;
                                description { state: "default" 0.0;
-                                       min: 0 30;
+                                       min: 0 32;
                                        fixed: 0 1;
                                        align: 0 0.5;
                                        rel1 {
                                                relative: 1.0 0.0;
-                                               offset: 16 19;
+                                               offset: 16 34;
                                                to_x: "checkbox.1";
                                                to_y: "subbox.1";
                                        }
                                        rel2 {
                                                relative: 0.0 1.0;
-                                               offset: 0 -19;
+                                               offset: 0 -34;
                                                to_x: "right_padding";
                                                to_y: "subbox.1";
                                        }
@@ -1491,27 +1465,44 @@ collections {
 
                        part { name: "text.2";
                                type: SWALLOW;
+                               ignore_flags: ON_HOLD;
                                mouse_events: 1;
                                scale: 1;
                                description { state: "default" 0.0;
-                                       min: 0 30;
+                                       min: 0 32;
                                        fixed: 0 1;
                                        align: 0 0.5;
                                        rel1 {
                                                relative: 1.0 0.0;
-                                               offset: 16 19;
+                                               offset: 16 34;
                                                to_x: "checkbox.2";
                                                to_y: "subbox.2";
                                        }
                                        rel2 {
                                                relative: 0.0 1.0;
-                                               offset: 0 -19;
+                                               offset: 0 -34;
                                                to_x: "right_padding";
                                                to_y: "subbox.2";
                                        }
                                }
                        }
                }
+               
+               programs {
+                       program {
+                               name: "text1_clicked";
+                               signal: "mouse,up,1";
+                               source: "text.1";
+                               action: SIGNAL_EMIT "elm,action,text1_clicked" "elm";
+                       }
+
+                       program {
+                               name: "text2_clicked";
+                               signal: "mouse,up,1";
+                               source: "text.2";
+                               action: SIGNAL_EMIT "elm,action,text2_clicked" "elm";
+                       }
+               }
        }
 
        group { name: "account_add_manual_button";
@@ -1521,8 +1512,8 @@ collections {
                                repeat_events: 1;
                                scale: 1;
                                description { state: "default" 0.0;
-                                       min: 720 161;
-                                       max: 720 161;
+                                       min: 720 128;
+                                       max: 720 128;
                                        color: 0 0 0 0;
                                        align: 0.0 0.5;
                                }
@@ -1533,11 +1524,11 @@ collections {
                                scale: 1;
                                description {
                                        state: "default" 0.0;
-                                       min: 0 5;
+                                       min: 0 40;
                                        fixed: 0 1;
                                        visible: 0;
                                        rel1 { to: "base"; relative: 0 0; }
-                                       rel2 { to: "base"; relative: 1 0; offset: 0 5; }
+                                       rel2 { to: "base"; relative: 1 0; }
                                        align: 0.0 0.0;
                                }
                        }
@@ -1549,9 +1540,9 @@ collections {
                                        min: 0 16;
                                        fixed: 0 1;
                                        visible: 0;
-                                       rel1 { to: "base"; relative: 0 1; offset: 0 -16; }
+                                       rel1 { to: "base"; relative: 0 1; }
                                        rel2 { to: "base"; relative: 1 1; }
-                                       align: 0.0 0.0;
+                                       align: 0.0 1.0;
                                }
                        }
 
@@ -1559,11 +1550,11 @@ collections {
                                type: RECT;
                                scale: 1;
                                description { state: "default" 0.0;
-                                       min: 78 0;
+                                       min: 117 0;
                                        fixed: 1 0;
                                        visible: 0;
                                        rel1 { to: "base"; relative: 0 0; }
-                                       rel2 { to: "base"; relative: 0 1; offset: 78 0; }
+                                       rel2 { to: "base"; relative: 0 1; }
                                        align: 0.0 0.0;
                                }
                        }
@@ -1572,35 +1563,12 @@ collections {
                                type: RECT;
                                scale: 1;
                                description { state: "default" 0.0;
-                                       min: 78 0;
+                                       min: 117 0;
                                        fixed: 1 0;
                                        visible: 0;
-                                       rel1 { to: "base"; relative: 1 0; offset: -78 0; }
+                                       rel1 { to: "base"; relative: 1 0; }
                                        rel2 { to: "base"; relative: 1 1; }
-                                       align: 0.0 0.0;
-                               }
-                       }
-
-                       part { name: "text";
-                               type: SWALLOW;
-                               mouse_events: 0;
-                               scale: 1;
-                               description { state: "default" 0.0;
-                                       min: 0 30;
-                                       fixed: 0 1;
-                                       align: 0 0.5;
-                                       rel1 {
-                                               relative: 1.0 1.0;
-                                               offset: 0 19;
-                                               to_x: "left_padding";
-                                               to_y: "top_padding";
-                                       }
-                                       rel2 {
-                                               relative: 0.0 1.0;
-                                               offset: 0 49;
-                                               to_x: "right_padding";
-                                               to_y: "top_padding";
-                                       }
+                                       align: 1.0 0.0;
                                }
                        }
 
@@ -1614,9 +1582,8 @@ collections {
                                        align: 0 0;
                                        rel1 {
                                                relative: 1.0 1.0;
-                                               offset: 0 19;
                                                to_x: "left_padding";
-                                               to_y: "text";
+                                               to_y: "top_padding";
                                        }
                                        rel2 {
                                                relative: 0.0 0.0;
@@ -1630,14 +1597,27 @@ collections {
 
        group { name: "account_add";
                parts {
-
+                       part { name: "bg";
+                               type: RECT;
+                               repeat_events: 1;
+                               scale: 1;
+                               description { state: "default" 0.0;
+                                       min: 720 623;
+                                       max: 720 623;
+                                       rel1 { relative: 0.0 0.0;}
+                                       rel2 { relative: 1.0 1.0;}
+                                       color: 0 0 0 0;
+                                       align: 0.0 0.0;
+                               }
+                       }
+                       
                        part { name: "list";
                                type: SWALLOW;
                                scale: 1;
                                description { state: "default" 0.0;
                                        align: 0 0;
-                                       rel1 { relative: 0 0; }
-                                       rel2 { relative: 1 0; offset: 0 295; }
+                                       rel1 { relative: 0 0; to: "bg"; }
+                                       rel2 { relative: 1 0; offset: 0 295; to: "bg"; }
                                }
                        }
 
@@ -1645,11 +1625,11 @@ collections {
                                type: SWALLOW;
                                scale: 1;
                                description { state: "default" 0.0;
-                                       min: 720 168;
-                                       max: 720 168;
+                                       min: 720 200;
+                                       max: 720 200;
                                        align: 0 0;
                                        rel1 { relative: 0 1.0; to_y: "list"; }
-                                       rel2 { relative: 1 1.0; offset: 0 168; to_y: "list"; }
+                                       rel2 { relative: 1 1.0; offset: 0 200; to_y: "list"; }
                                }
                        }
 
@@ -1657,11 +1637,11 @@ collections {
                                type: SWALLOW;
                                scale: 1;
                                description { state: "default" 0.0;
-                                       min: 720 161;
-                                       max: 720 161;
+                                       min: 720 128;
+                                       max: 720 128;
                                        align: 0 0;
                                        rel1 { relative: 0 1.0; to_y: "checkbox_set"; }
-                                       rel2 { relative: 1 1.0; offset: 0 161; to_y: "checkbox_set"; }
+                                       rel2 { relative: 1 1.0; offset: 0 128; to_y: "checkbox_set"; }
                                }
                        }
                }
@@ -1674,8 +1654,8 @@ collections {
                                repeat_events: 1;
                                scale: 1;
                                description { state: "default" 0.0;
-                                       min: 720 750;
-                                       max: 720 750;
+                                       min: 720 753;
+                                       max: 720 753;
                                        rel1 { relative: 0.0 0.0;}
                                        rel2 { relative: 1.0 1.0;}
                                        color: 0 0 0 0;
@@ -1697,11 +1677,11 @@ collections {
                                type: SWALLOW;
                                scale: 1;
                                description { state: "default" 0.0;
-                                       min: 720 168;
-                                       max: 720 168;
+                                       min: 720 200;
+                                       max: 720 200;
                                        align: 0 0;
                                        rel1 { relative: 0 1.0; to_y: "list"; }
-                                       rel2 { relative: 1 1.0; offset: 0 168; to_y: "list"; }
+                                       rel2 { relative: 1 1.0; offset: 0 200; to_y: "list"; }
                                }
                        }
 
@@ -1709,11 +1689,11 @@ collections {
                                type: SWALLOW;
                                scale: 1;
                                description { state: "default" 0.0;
-                                       min: 720 161;
-                                       max: 720 161;
+                                       min: 720 128;
+                                       max: 720 128;
                                        align: 0 0;
                                        rel1 { relative: 0 1.0; to_y: "checkbox_set"; }
-                                       rel2 { relative: 1 1.0; offset: 0 161; to_y: "checkbox_set"; }
+                                       rel2 { relative: 1 1.0; offset: 0 128; to_y: "checkbox_set"; }
                                }
                        }
                }