Fix menu tree in settings

[Issue]    N/A
[Problem]  Some thinks does not match menu tree tests
[Solution] Added translations, modified Autofill forms
[Verify]   Menu tree in settings should match tests

Change-Id: Ifd8d7cbf20d8de75a9afd10144fc69ad4d61daae

diff --git a/core/Tools/SettingsEnums.h b/core/Tools/SettingsEnums.h
index ec32a2327ee621614295267e55b0efb3d1681588..89d4996b7b8840e71b539fef5163c087e995a2be 100644 (file)
--- a/core/Tools/SettingsEnums.h
+++ b/core/Tools/SettingsEnums.h
@@ -29,7 +29,7 @@ namespace base_ui
 {
 namespace Translations {
     ADD_TRAN(Google,"Google")
-    ADD_TRAN(Yahoo,"Yahoo!")
+    ADD_TRAN(Yahoo,"Yahoo")
     ADD_TRAN(Bing,"Bing")
     ADD_TRAN(SamsungPage,"http://www.samsung.com")
     ADD_TRAN(QuickPage,"QUICK_ACCESS")
@@ -42,7 +42,7 @@ namespace Translations {
     ADD_TRAN(SettingsMainHomePage, "IDS_BR_BUTTON_HOMEPAGE_ABB")
     ADD_TRAN(SettingsMainHomePageDefault,"IDS_BR_BODY_DEFAULT")
     ADD_TRAN(SettingsMainDefaultSearchEngine,"IDS_BR_TMBODY_DEFAULT_SEARCH_ENGINE")
-    ADD_TRAN(SettingsMainAutoFillProfiles,"IDS_BR_BODY_AUTO_FILL_FORMS_T_TTS")
+    ADD_TRAN(SettingsMainAutoFillProfiles,"IDS_BR_MBODY_MY_AUTO_FILL_PROFILE")
     ADD_TRAN(SettingsMainAutoFillProfilesSub,"IDS_BR_SBODY_MANAGE_DATA_USED_TO_FILL_IN_FORMS_ONLINE")
     ADD_TRAN(SettingsMainManualZoom,"IDS_BR_MBODY_MANUAL_ZOOM")
     ADD_TRAN(SettingsMainManualZoomSub,"IDS_BR_BODY_OVERRIDE_WEBSITES_REQUEST_TO_CONTROL_ZOOM")
@@ -50,7 +50,7 @@ namespace Translations {
     ADD_TRAN(SettingsMainAdvanced,"IDS_BR_BODY_ADVANCED")
     ADD_TRAN(SettingsDefaultSearchEngineTitle,"IDS_BR_TMBODY_DEFAULT_SEARCH_ENGINE")
     ADD_TRAN(SettingsAdvancedTitle,"IDS_BR_BODY_ADVANCED")
-    ADD_TRAN(SettingsAdvancedEnableJavaScript,"IDS_BR_OPT_ENABLE_JAVASCRIPT")
+    ADD_TRAN(SettingsAdvancedEnableJavaScript,"IDS_BR_TMBODY_TURN_ON_JAVASCRIPT")
     ADD_TRAN(SettingsAdvancedEnableJavaScriptSub,"IDS_BR_BODY_ALLOW_SITES_TO_RUN_JAVASCRIPT")
     ADD_TRAN(SettingsAdvancedBlockPopups,"IDS_BR_BODY_BLOCK_POP_UPS")
     ADD_TRAN(SettingsAdvancedBlockPopupsSub,"IDS_BR_BODY_BLOCK_POP_UPS_ON_WEBPAGES")
@@ -67,8 +67,8 @@ namespace Translations {
     ADD_TRAN(SettingsPrivacySaveSigninInfoSub,"IDS_BR_SBODY_SET_YOUR_DEVICE_TO_SHOW_A_POP_UP_WITH_THE_OPTION_MSG")
     ADD_TRAN(SettingsPrivacyDeletePersonalData,"IDS_BR_BODY_DELETE_PERSONAL_DATA")
     ADD_TRAN(SettingsDelPersDataTitle,"IDS_BR_BODY_DELETE_PERSONAL_DATA")
-    ADD_TRAN(SettingsDelPersDataCancel,"IDS_TPLATFORM_ACBUTTON_DONE_ABB")
-    ADD_TRAN(SettingsDelPersDataDelete,"IDS_TPLATFORM_ACBUTTON_DELETE_ABB")
+    ADD_TRAN(SettingsDelPersDataCancel,"IDS_BR_SK_CANCEL")
+    ADD_TRAN(SettingsDelPersDataDelete,"IDS_BR_SK_DELETE")
     ADD_TRAN(SettingsDelPersDataSelectAll,"IDS_BR_OPT_SELECT_ALL_ABB")
     ADD_TRAN(SettingsDelPersDataBrowsingHistory,"IDS_BR_BODY_BROWSING_HISTORY")
     ADD_TRAN(SettingsDelPersDataCache,"IDS_BR_OPT_CACHE")

diff --git a/services/SettingsUI/SettingsAFCreator.cpp b/services/SettingsUI/SettingsAFCreator.cpp
index dbb26053f5bd47f966441ae7269588da19f03846..ccac5f9cbb6a74fe3dde81c53f2b89b6cfb7db2c 100644 (file)
--- a/services/SettingsUI/SettingsAFCreator.cpp
+++ b/services/SettingsUI/SettingsAFCreator.cpp
@@ -236,7 +236,6 @@ void SettingsAFCreator::clearFields()
         elm_object_part_text_set(m_cityTownItemCallbackData.entry, "elm.text", "");
         elm_object_part_text_set(m_countryItemCallbackData.entry, "elm.text", "");
         elm_object_part_text_set(m_postCodeItemCallbackData.entry, "elm.text", "");
-        elm_object_part_text_set(m_countryRegionItemCallbackData.entry, "elm.text", "");
         elm_object_part_text_set(m_phoneItemCallbackData.entry, "elm.text", "");
         elm_object_part_text_set(m_emailItemCallbackData.entry, "elm.text", "");
     }
@@ -276,21 +275,21 @@ void SettingsAFCreator::addItems()
 
     // city town
     m_cityTownItemCallbackData.type = profile_composer_title_city_town;
-    createInputLayout(m_box, strdup(_("IDS_BR_BODY_CITY_TOWN_ABB")), &m_cityTownItemCallbackData);
+    createInputLayout(m_box, strdup(_("Town/City/County")), &m_cityTownItemCallbackData);
     elm_box_pack_end(m_box, m_cityTownItemCallbackData.it);
     if (m_item->getCityTown() && strlen(m_item->getCityTown()))
         elm_object_part_text_set(m_cityTownItemCallbackData.entry, "elm.text", m_item->getCityTown());
 
     // country
     m_countryItemCallbackData.type = profile_composer_title_country;
-    createInputLayout(m_box, strdup("Country"), &m_countryItemCallbackData);
+    createInputLayout(m_box, strdup(_("IDS_BR_MBODY_COUNTRY_REGION")), &m_countryItemCallbackData);
     elm_box_pack_end(m_box, m_countryItemCallbackData.it);
     if (m_item->getCountry() && strlen(m_item->getCountry()))
         elm_object_part_text_set(m_countryItemCallbackData.entry, "elm.text", m_item->getCountry());
 
     // post code
     m_postCodeItemCallbackData.type = profile_composer_title_post_code;
-    createInputLayout(m_box, strdup(_("IDS_BR_BODY_POSTCODE_ABB")), &m_postCodeItemCallbackData);
+    createInputLayout(m_box, strdup(_("Post code")), &m_postCodeItemCallbackData);
     elm_box_pack_end(m_box, m_postCodeItemCallbackData.it);
     Elm_Entry_Filter_Limit_Size m_entryLimitSize;
     Elm_Entry_Filter_Accept_Set m_entry_accept_set;
@@ -304,12 +303,6 @@ void SettingsAFCreator::addItems()
     elm_entry_input_panel_layout_set(m_postCodeItemCallbackData.entry, ELM_INPUT_PANEL_LAYOUT_NUMBERONLY);
     elm_entry_prediction_allow_set(m_postCodeItemCallbackData.entry, EINA_FALSE);
 
-    // country region
-    m_countryRegionItemCallbackData.type = profile_composer_title_country_region;
-    createInputLayout(m_box, strdup(_("IDS_BR_MBODY_COUNTRY_REGION")), &m_countryRegionItemCallbackData);
-    elm_box_pack_end(m_box, m_countryRegionItemCallbackData.it);
-    if (m_item->getStateProvince() && strlen(m_item->getStateProvince()))
-        elm_object_part_text_set(m_countryRegionItemCallbackData.entry, "elm.text", m_item->getStateProvince());
 
     // phone
     m_phoneItemCallbackData.type = profile_composer_title_phone;
@@ -342,7 +335,6 @@ void SettingsAFCreator::addItems()
     genlistCallbackVector.push_back(&m_cityTownItemCallbackData);
     genlistCallbackVector.push_back(&m_countryItemCallbackData);
     genlistCallbackVector.push_back(&m_postCodeItemCallbackData);
-    genlistCallbackVector.push_back(&m_countryRegionItemCallbackData);
     genlistCallbackVector.push_back(&m_phoneItemCallbackData);
     genlistCallbackVector.push_back(&m_emailItemCallbackData);
 }
@@ -416,8 +408,6 @@ Eina_Bool SettingsAFCreator::applyEntryData(void)
     m_item->setCountry(country);
     const char *post_code = elm_entry_entry_get(m_postCodeItemCallbackData.entry);
     m_item->setPostCode(post_code);
-    const char *region = elm_entry_entry_get(m_countryRegionItemCallbackData.entry);
-    m_item->setStateProvince(region);
     const char *phone = elm_entry_entry_get(m_phoneItemCallbackData.entry);
     m_item->setPhoneNumber(phone);
     const char *email = elm_entry_entry_get(m_emailItemCallbackData.entry);
@@ -542,8 +532,6 @@ void SettingsAFCreator::__entry_next_key_cb(void* data, Evas_Object*, void*)
     } else if (type == profile_composer_title_country) {
         entry = self->m_postCodeItemCallbackData.entry;
     } else if (type == profile_composer_title_post_code) {
-        entry = self->m_countryRegionItemCallbackData.entry;
-    } else if (type == profile_composer_title_country_region) {
         entry = self->m_phoneItemCallbackData.entry;
     } else if (type == profile_composer_title_phone) {
         entry = self->m_emailItemCallbackData.entry;

diff --git a/services/SettingsUI/SettingsAFCreator.h b/services/SettingsUI/SettingsAFCreator.h
index 6ff7ba57668c69493740e0f21d0eecb1df9fe2c9..06283ae10551b06f5070766fd4575aa29f8fb0d6 100644 (file)
--- a/services/SettingsUI/SettingsAFCreator.h
+++ b/services/SettingsUI/SettingsAFCreator.h
@@ -97,7 +97,6 @@ protected:
     genlistCallbackData m_cityTownItemCallbackData;
     genlistCallbackData m_countryItemCallbackData;
     genlistCallbackData m_postCodeItemCallbackData;
-    genlistCallbackData m_countryRegionItemCallbackData;
     genlistCallbackData m_phoneItemCallbackData;
     genlistCallbackData m_emailItemCallbackData;