From c6028abb6b5e13410bcbc32d2ad46bfc9345434d Mon Sep 17 00:00:00 2001 From: Minsoo Kim Date: Tue, 18 Sep 2012 10:59:46 +0900 Subject: [PATCH] fix SDK issues --- setting/src/email-setting-utils.c | 2 +- setting/src/email-view-account-edit.c | 22 +++++++-- setting/src/email-view-account-options.c | 2 +- setting/theme/email-setting-theme.edc | 82 ++++++++++++++++++++++---------- 4 files changed, 77 insertions(+), 31 deletions(-) diff --git a/setting/src/email-setting-utils.c b/setting/src/email-setting-utils.c index e637358..974cb63 100755 --- a/setting/src/email-setting-utils.c +++ b/setting/src/email-setting-utils.c @@ -706,7 +706,7 @@ char *setting_get_service_fail_type(int type) ret = N_("DB operation failed"); return strdup(ret); } else if (type == EMAIL_ERROR_ALREADY_EXISTS) { - ret = N_("Already exists"); + ret = _("IDS_EMAIL_POP_ACCOUNT_ALREADY_EXISTS"); return strdup(ret); } else if (type == EMAIL_ERROR_TLS_NOT_SUPPORTED) { ret = N_("Server not support TLS"); diff --git a/setting/src/email-view-account-edit.c b/setting/src/email-view-account-edit.c index 5308d77..9bcdba2 100755 --- a/setting/src/email-view-account-edit.c +++ b/setting/src/email-view-account-edit.c @@ -962,21 +962,25 @@ static void _onoff_cb(void *data, Evas_Object *obj, void *event_info) /* user name */ if (p->gl_sending_user_item) { elm_object_item_disabled_set(p->gl_sending_user_item, EINA_TRUE); + elm_entry_context_menu_disabled_set(p->entry_sending_username, EINA_TRUE); } /* password */ if (p->gl_sending_pw_item) { elm_object_item_disabled_set(p->gl_sending_pw_item, EINA_TRUE); + elm_entry_context_menu_disabled_set(p->entry_sending_password, EINA_TRUE); } } else { /* user name */ if (p->gl_sending_user_item) { elm_object_item_disabled_set(p->gl_sending_user_item, EINA_FALSE); + elm_entry_context_menu_disabled_set(p->entry_sending_username, EINA_FALSE); } /* password */ if (p->gl_sending_pw_item) { elm_object_item_disabled_set(p->gl_sending_pw_item, EINA_FALSE); + elm_entry_context_menu_disabled_set(p->entry_sending_password, EINA_FALSE); } } } @@ -1247,8 +1251,6 @@ static char *_gl_secure_text_get_cb(void *data, Evas_Object *obj, const char *pa debug_enter(); int index = (int)data; - struct viewdata *vd = g_vd; - struct priv_data *p = vd->priv; email_account_t *account = account_data; char buf[MAX_STR_LEN] = { 0, }; @@ -1333,8 +1335,6 @@ static char *_gl_server_type_text_get_cb(void *data, Evas_Object *obj, const cha { debug_enter(); - struct viewdata *vd = g_vd; - struct priv_data *p = vd->priv; email_account_t *account = account_data; char buf[MAX_STR_LEN] = { 0, }; @@ -1660,6 +1660,11 @@ static Evas_Object *_gl_ef_content_get_cb(void *data, Evas_Object *obj, const ch elm_entry_input_panel_return_key_disabled_set(p->entry_sending_username, EINA_TRUE); elm_entry_cnp_mode_set(p->entry_sending_username, ELM_CNP_MODE_PLAINTEXT); elm_entry_input_panel_layout_set(p->entry_sending_username, ELM_INPUT_PANEL_LAYOUT_EMAIL); + if (account_data->outgoing_server_use_same_authenticator) { + elm_entry_context_menu_disabled_set(p->entry_sending_username, EINA_TRUE); + } else { + elm_entry_context_menu_disabled_set(p->entry_sending_username, EINA_FALSE); + } evas_object_smart_callback_add(p->entry_sending_username, "changed", _backup_input_cb, p->ef_sending_username); evas_object_smart_callback_add(p->entry_sending_username, "focused", _entry_focused_cb, p->ef_sending_username); @@ -1688,6 +1693,11 @@ static Evas_Object *_gl_ef_content_get_cb(void *data, Evas_Object *obj, const ch elm_entry_password_set(p->entry_sending_password, 1); elm_entry_cnp_mode_set(p->entry_sending_password, ELM_CNP_MODE_PLAINTEXT); elm_entry_input_panel_layout_set(p->entry_sending_password, ELM_INPUT_PANEL_LAYOUT_EMAIL); + if (account_data->outgoing_server_use_same_authenticator) { + elm_entry_context_menu_disabled_set(p->entry_sending_password, EINA_TRUE); + } else { + elm_entry_context_menu_disabled_set(p->entry_sending_password, EINA_FALSE); + } evas_object_smart_callback_add(p->entry_sending_password, "changed", _backup_input_cb, p->ef_sending_password); evas_object_smart_callback_add(p->entry_sending_password, "focused", _entry_focused_cb, p->ef_sending_password); @@ -1969,21 +1979,25 @@ static void _gl_onoff_sel_cb(void *data, Evas_Object *obj, void *event_info) /* user name */ if (p->gl_sending_user_item) { elm_object_item_disabled_set(p->gl_sending_user_item, EINA_TRUE); + elm_entry_context_menu_disabled_set(p->entry_sending_username, EINA_TRUE); } /* password */ if (p->gl_sending_pw_item) { elm_object_item_disabled_set(p->gl_sending_pw_item, EINA_TRUE); + elm_entry_context_menu_disabled_set(p->entry_sending_password, EINA_TRUE); } } else { /* user name */ if (p->gl_sending_user_item) { elm_object_item_disabled_set(p->gl_sending_user_item, EINA_FALSE); + elm_entry_context_menu_disabled_set(p->entry_sending_username, EINA_FALSE); } /* password */ if (p->gl_sending_pw_item) { elm_object_item_disabled_set(p->gl_sending_pw_item, EINA_FALSE); + elm_entry_context_menu_disabled_set(p->entry_sending_password, EINA_FALSE); } } break; diff --git a/setting/src/email-view-account-options.c b/setting/src/email-view-account-options.c index 493bdfd..9d40584 100755 --- a/setting/src/email-view-account-options.c +++ b/setting/src/email-view-account-options.c @@ -1317,7 +1317,7 @@ static Evas_Object *_gl_ef_content_get_cb(void *data, Evas_Object *obj, const ch p->entry_sig = elm_entry_add(p->genlist); elm_entry_cnp_mode_set(p->entry_sig, ELM_CNP_MODE_PLAINTEXT); - elm_entry_input_panel_layout_set(p->entry_sig, ELM_INPUT_PANEL_LAYOUT_EMAIL); + elm_entry_input_panel_layout_set(p->entry_sig, ELM_INPUT_PANEL_LAYOUT_NORMAL); if (account_data->options.add_signature) { elm_entry_editable_set(p->entry_sig, TRUE); elm_entry_context_menu_disabled_set(p->entry_sig, EINA_FALSE); diff --git a/setting/theme/email-setting-theme.edc b/setting/theme/email-setting-theme.edc index dbc3337..9e4d008 100755 --- a/setting/theme/email-setting-theme.edc +++ b/setting/theme/email-setting-theme.edc @@ -1022,8 +1022,8 @@ collections { scale: 1; description { state: "default" 0.0; - min: 720 80; - max: 720 80; + min: 720 26; + max: 720 26; fixed: 0 1; rel1 { relative: 0 0; } rel2 { relative: 1 0; } @@ -1039,8 +1039,8 @@ collections { description { state: "default" 0.0; fixed: 1 1; - min: 720 80; - max: 720 80; + min: 720 248; + max: 720 248; rel1 { relative: 0 1.0; to_y: "top_padding"; } align: 0.5 0; color: 0 0 0 0; @@ -1057,7 +1057,7 @@ collections { max: 80 80; rel1 { relative: 0 0; offset: 180 0; to: "bg_for_sp"; } rel2 { relative: 0 1; offset: 260 0; to: "bg_for_sp"; } - align: 0.5 0; + align: 0.5 0.5; image.normal: "M02_email_list_icon_gmail.png"; } } @@ -1072,7 +1072,7 @@ collections { max: 80 80; rel1 { relative: 0 0; offset: 320 0; to: "bg_for_sp"; } rel2 { relative: 0 1; offset: 400 0; to: "bg_for_sp"; } - align: 0.5 0; + align: 0.5 0.5; image.normal: "M02_email_list_icon_hotmail.png"; } } @@ -1087,7 +1087,7 @@ collections { max: 80 80; rel1 { relative: 0 0; offset: 460 0; to: "bg_for_sp"; } rel2 { relative: 0 1; offset: 540 0; to: "bg_for_sp"; } - align: 0.5 0; + align: 0.5 0.5; image.normal: "M02_email_list_icon_AOL.png"; } } @@ -1098,8 +1098,8 @@ collections { scale: 1; description { state: "default" 0.0; - min: 720 50; - max: 720 50; + min: 720 16; + max: 720 16; fixed: 1 1; align: 0.5 0; rel1 { relative: 0 1.0; to_y: "bg_for_sp"; } @@ -1115,12 +1115,28 @@ collections { description { state: "default" 0.0; fixed: 1 1; - min: 620 160; - max: 620 160; + min: 620 114; + max: 620 114; rel1 { relative: 0 1.0; to_y: "middle_padding2"; } align: 0.5 0; } } + + part { + name: "middle_padding3"; + type: RECT; + scale: 1; + description { + state: "default" 0.0; + min: 720 16; + max: 720 16; + fixed: 1 1; + align: 0.5 0; + rel1 { relative: 0 1.0; to_y: "label"; } + rel2 { relative: 1 1.0; to_y: "label"; } + color: 0 0 0 0; + } + } part { name: "list"; @@ -1128,7 +1144,7 @@ collections { scale: 1; description { state: "default" 0.0; - rel1 { relative: 0 1.0; to_y: "label"; } + rel1 { relative: 0 1.0; to_y: "middle_padding3"; } } } } @@ -1150,8 +1166,8 @@ collections { scale: 1; description { state: "default" 0.0; - min: 720 80; - max: 720 80; + min: 720 26; + max: 720 26; fixed: 0 1; rel1 { relative: 0 0; } rel2 { relative: 1 0; } @@ -1167,8 +1183,8 @@ collections { description { state: "default" 0.0; fixed: 1 1; - min: 720 80; - max: 720 80; + min: 720 248; + max: 720 248; rel1 { relative: 0 1.0; to_y: "top_padding"; } align: 0.5 0; color: 0 0 0 0; @@ -1185,7 +1201,7 @@ collections { max: 80 80; rel1 { relative: 0 0; offset: 110 0; to: "bg_for_sp"; } rel2 { relative: 0 1; offset: 190 0; to: "bg_for_sp"; } - align: 0.5 0; + align: 0.5 0.5; image.normal: "M02_email_list_icon_exchange.png"; } } @@ -1200,7 +1216,7 @@ collections { max: 80 80; rel1 { relative: 0 0; offset: 250 0; to: "bg_for_sp"; } rel2 { relative: 0 1; offset: 330 0; to: "bg_for_sp"; } - align: 0.5 0; + align: 0.5 0.5; image.normal: "M02_email_list_icon_gmail.png"; } } @@ -1215,7 +1231,7 @@ collections { max: 80 80; rel1 { relative: 0 0; offset: 390 0; to: "bg_for_sp"; } rel2 { relative: 0 1; offset: 470 0; to: "bg_for_sp"; } - align: 0.5 0; + align: 0.5 0.5; image.normal: "M02_email_list_icon_hotmail.png"; } } @@ -1230,7 +1246,7 @@ collections { max: 80 80; rel1 { relative: 0 0; offset: 530 0; to: "bg_for_sp"; } rel2 { relative: 0 1; offset: 610 0; to: "bg_for_sp"; } - align: 0.5 0; + align: 0.5 0.5; image.normal: "M02_email_list_icon_AOL.png"; } } @@ -1241,8 +1257,8 @@ collections { scale: 1; description { state: "default" 0.0; - min: 720 50; - max: 720 50; + min: 720 16; + max: 720 16; fixed: 1 1; align: 0.5 0; rel1 { relative: 0 1.0; to_y: "bg_for_sp"; } @@ -1258,12 +1274,28 @@ collections { description { state: "default" 0.0; fixed: 1 1; - min: 620 160; - max: 620 160; + min: 620 114; + max: 620 114; rel1 { relative: 0 1.0; to_y: "middle_padding2"; } align: 0.5 0; } } + + part { + name: "middle_padding3"; + type: RECT; + scale: 1; + description { + state: "default" 0.0; + min: 720 16; + max: 720 16; + fixed: 1 1; + align: 0.5 0; + rel1 { relative: 0 1.0; to_y: "label"; } + rel2 { relative: 1 1.0; to_y: "label"; } + color: 0 0 0 0; + } + } part { name: "list"; @@ -1271,7 +1303,7 @@ collections { scale: 1; description { state: "default" 0.0; - rel1 { relative: 0 1.0; to_y: "label"; } + rel1 { relative: 0 1.0; to_y: "middle_padding3"; } } } } -- 2.7.4