From bf950cadc70445cae082c8de52b29d4723177396 Mon Sep 17 00:00:00 2001 From: San Cho Date: Mon, 4 Feb 2013 13:53:03 +0900 Subject: [PATCH] Merged with the code of setting --- setting/src/email-setting.c | 6 ++++-- setting/src/email-view-account-setup.c | 29 +++-------------------------- setting/src/email-view-setting.c | 3 ++- 3 files changed, 9 insertions(+), 29 deletions(-) diff --git a/setting/src/email-setting.c b/setting/src/email-setting.c index 8d8ed9c..a4a9387 100755 --- a/setting/src/email-setting.c +++ b/setting/src/email-setting.c @@ -823,7 +823,8 @@ static void _dispatch_view(struct ug_data *ugd) setting_change_view(VIEW_SETTING, ugd); } else if (!strcmp(ugd->start_view_type, EMAIL_BUNDLE_VAL_VIEW_FIRST_SETUP)) { debug_log("Setup wizard is up"); - setting_change_view(VIEW_INITIAL_ACCESS, ugd); + ugd->account_info = NULL; + setting_change_view(VIEW_ACCOUNT_SETUP, ugd); } else if (!strcmp(ugd->start_view_type, EMAIL_BUNDLE_VAL_VIEW_ACCOUNT_EDIT)) { debug_log("Edit view is up"); setting_change_view(VIEW_SYNC_SCHEDULE, ugd); @@ -836,7 +837,8 @@ static void _dispatch_view(struct ug_data *ugd) } } else if (!strcmp(ugd->start_view_type, EMAIL_BUNDLE_VAL_VIEW_SELECT_ACCOUNT)) { debug_log("select account view is up"); - setting_change_view(VIEW_SP_SELECT, ugd); + ugd->account_info = NULL; + setting_change_view(VIEW_ACCOUNT_SETUP, ugd); } else { setting_change_view(VIEW_SETTING, ugd); } diff --git a/setting/src/email-view-account-setup.c b/setting/src/email-view-account-setup.c index eb9bd07..a021930 100755 --- a/setting/src/email-view-account-setup.c +++ b/setting/src/email-view-account-setup.c @@ -1056,34 +1056,11 @@ static void _back_cb(void *data, Evas_Object *obj, void *event_info) return; } - if (p->entry_account_name) { - elm_object_focus_allow_set(p->entry_account_name, EINA_FALSE); - } - - if (p->entry_email_address) { - elm_object_focus_allow_set(p->entry_email_address, EINA_FALSE); - } - - if (p->entry_password) { - elm_object_focus_allow_set(p->entry_password, EINA_FALSE); - } - - Ecore_IMF_Context *imf_context = NULL; - imf_context = elm_entry_imf_context_get(p->clicked_object); - if (imf_context) { - ecore_imf_context_input_panel_hide(imf_context); - ecore_imf_context_input_panel_event_callback_del(imf_context, - ECORE_IMF_INPUT_PANEL_STATE_EVENT, _input_panel_state_changed_cb); - } - - elm_object_disabled_set(p->l_button, EINA_TRUE); - elm_object_disabled_set(p->r_button, EINA_TRUE); - elm_object_disabled_set(p->r_button2, EINA_TRUE); - elm_object_disabled_set(p->manual_btn, EINA_TRUE); - elm_object_disabled_set(p->tool_btn, EINA_TRUE); - if (!strcmp(vd->ugd->start_view_type, "account-add")) { ug_destroy_me(vd->ugd->ug); + } else if (!strcmp(vd->ugd->start_view_type, EMAIL_BUNDLE_VAL_VIEW_FIRST_SETUP) || + !strcmp(vd->ugd->start_view_type, EMAIL_BUNDLE_VAL_VIEW_SELECT_ACCOUNT)) { + elm_win_lower(vd->ugd->win); } else { setting_back_to_prev_view(vd); } diff --git a/setting/src/email-view-setting.c b/setting/src/email-view-setting.c index 451d7ec..5075f96 100755 --- a/setting/src/email-view-setting.c +++ b/setting/src/email-view-setting.c @@ -512,7 +512,8 @@ static void _add_account_cb(void *data, Evas_Object *obj, void *event_info) if(ugd->account_count >= MAX_ACCOUNT_COUNT) { _create_max_account_popup_create(ugd); } else { - setting_change_view(VIEW_SP_SELECT, vd->ugd); + ugd->account_info = NULL; + setting_change_view(VIEW_ACCOUNT_SETUP, vd->ugd); } } -- 2.7.4