Fixed gengrid and Location view bugs. New Location behaviour. Logs tweak. 55/61055/16
authorBartlomiej Uliasz <b.uliasz@samsung.com>
Thu, 3 Mar 2016 14:01:54 +0000 (15:01 +0100)
committerBartlomiej Uliasz <b.uliasz@samsung.com>
Fri, 11 Mar 2016 11:50:31 +0000 (12:50 +0100)
Change-Id: I92d57c5b9e4511145e2a6d523b170c74c0a0a7f4
Signed-off-by: Bartlomiej Uliasz <b.uliasz@samsung.com>
22 files changed:
include/app_debug.h
include/common/gridmgr.h
include/common/listmgr.h
include/data/system/data_location.h
include/define.h
include/layout.h
po/en.po
po/en_US.po
res/widget/gengrid_default.edc
src/common/gridmgr.c
src/common/listmgr.c
src/common/utils.c
src/common/viewmgr.c
src/data/system/data_location.c
src/layout/layout_network.c
src/layout/layout_sound.c
src/layout/layout_system.c
src/main.c
src/view/system/view_clock.c
src/view/system/view_location.c
src/view/system/view_pincode.c
src/view/view_base.c

index 5499a59..62d8b4c 100644 (file)
 #define TIZEN_DEBUG_ENABLE
 #include <dlog.h>
 
+// added to solve problem with double dlog texts, also helpfull to see how long does it take
+extern long int _timens();
+
 #ifndef _ERR
-#define _ERR(fmt, args...) LOGE(fmt"\n", ##args)
+#define _ERR(fmt, args...) LOGE("[%ld] "fmt"\n", _timens(), ##args)
 #endif
 
 #ifndef _DBG
-#define _DBG(fmt, args...) LOGD(fmt"\n", ##args)
+#define _DBG(fmt, args...) LOGD("[%ld] "fmt"\n", _timens(), ##args)
 #endif
 
 #ifndef _INFO
-#define _INFO(fmt, args...) LOGI(fmt"\n", ##args)
+#define _INFO(fmt, args...) LOGI("[%ld] "fmt"\n", _timens(), ##args)
 #endif
 
 #ifdef LOG_TAG
 #ifdef SETTING_ENABLE_TRACE
 #define SETTING_TRACE_SECURE_DEBUG(fmt, arg...) \
        do {\
-               SECURE_LOGD("\033[0;32mDEBUG: " fmt "\033[0m\n", ##arg);\
+               SECURE_LOGD("\033[0;32mDEBUG[%ld]: " fmt "\033[0m\n", _timens(), ##args));\
        }while(0);
 
 #define SETTING_TRACE_DEBUG(fmt, arg...) \
        do {\
-               SECURE_LOGD("\033[0;32mDEBUG: " fmt "\033[0m\n", ##arg);\
+               SECURE_LOGD("\033[0;32mDEBUG[%ld]:: " fmt "\033[0m\n", _timens(), ##arg);\
        }while(0);
 
 #define SETTING_TRACE(fmt, arg...) \
        do {\
-               SECURE_LOGI("\033[0;36m" fmt "\033[0m\n", ##arg);\
+               SECURE_LOGI("\033[0;36m[%ld]:" fmt "\033[0m\n", _timens(), ##arg);\
        }while(0);
 
 #define SETTING_TRACE_WARNING(fmt, arg...) \
        do {\
-               SECURE_LOGI("\033[0;33mWARRING: " fmt "\033[0m\n", ##arg);\
+               SECURE_LOGI("\033[0;33mWARRING[%ld]: " fmt "\033[0m\n", _timens(), ##arg);\
        }while(0);
 
 #define SETTING_TRACE_ERROR(fmt, arg...) \
        do {\
-               SECURE_LOGE("\033[0;31mERROR: " fmt "\033[0m\n", ##arg);\
+               SECURE_LOGE("\033[0;31mERROR[%ld]: " fmt "\033[0m\n", _timens(), ##arg);\
        }while(0);
 #define SETTING_TRACE_BEGIN do {\
-               SECURE_LOGD("\033[0;35mENTER FUNCTION: %s. \033[0m\n", __FUNCTION__);\
+               SECURE_LOGD("\033[0;35mENTER FUNCTION[%ld]: %s. \033[0m\n", _timens(), __FUNCTION__);\
        }while(0);
 
 #define SETTING_TRACE_END  do {\
-               SECURE_LOGD("\033[0;35mEXIT FUNCTION: %s. \033[0m\n", __FUNCTION__);\
+               SECURE_LOGD("\033[0;35mEXIT FUNCTION[%ld]: %s. \033[0m\n", _timens(), __FUNCTION__);\
        }while(0);
 #else
 #define SETTING_TRACE(fmt, arg...)
index 3eef057..2785b11 100644 (file)
@@ -71,15 +71,17 @@ bool gridmgr_add_grid(struct gridmgr *gmgr, const char *grid_id,
 bool gridmgr_remove_grid(struct gridmgr *gmgr, const char *grid_id);
 
 /**
- * @brief      Append items of 'item_list' to grid object
+ * @brief      Clears grid and adds items of 'item_list' to grid object
  * @param[in]  gmgr            Gridmgr handle
  * @param[in]  grid_id         Grid ID
  * @param[in]  item_list       Eina_List which will be appended to grid object
+ * @param[in]  get_item_by_data        Item to be returned in 'item_out' if found. NULL to ignore.
+ * @param[out] item_out        Returned item with data of 'get_item_by_data'. NULL to ignore.
  * @retval     true            Success to append all
  * @retval     false           Operation failed
  */
-bool gridmgr_append_list(struct gridmgr *gmgr, const char *grid_id,
-               Eina_List *item_list);
+bool gridmgr_replace_list(struct gridmgr *gmgr, const char *grid_id,
+               Eina_List *item_list, void *item_data_to_find, Elm_Object_Item **item_found);
 
 /**
  * @brief      Prepend items of 'item_list' to grid object
index 8bb6c4c..9f27a5c 100644 (file)
@@ -17,6 +17,7 @@
 #ifndef __AIR_SETTINGS_LISTMGR_H__
 #define __AIR_SETTINGS_LISTMGR_H__
 
+#include "common/inputmgr.h"
 #include "common/gridmgr.h"
 
 struct listmgr;
@@ -29,15 +30,29 @@ bool listmgr_add_list(struct listmgr *listmgr, const char *list_id,
                void (*selected_cb)(Elm_Object_Item *it, void *data),
                void *cb_data);
 bool listmgr_remove_list(struct listmgr *listmgr, const char *list_id);
-
-bool listmgr_show_list(struct listmgr *listmgr, const char *list_id,
-               const char *part, Eina_List *list);
-bool listmgr_hide_list(struct listmgr *listmgr, const char *list_id,
+bool listmgr_fill_grid(struct listmgr *listmgr, const char *list_id,
+               Eina_List *list, void *get_item, Elm_Object_Item **item_returned);
+bool listmgr_show_grid(struct listmgr *listmgr, const char *list_id,
+               const char *part, Elm_Object_Item *select_item);
+bool listmgr_hide_grid(struct listmgr *listmgr, const char *list_id,
                const char *part);
-bool listmgr_update_list(struct listmgr *listmgr, const char *list_id);
+
+/**
+ * @brief      Set next focused object to the list (grid) in specified direction.
+ * @param[in]  listmgr                 List manager handle
+ * @param[in]  list_id                 ID of list
+ * @param[in]  obj_to_focus    Object which should be focused in specified direction to list.
+ *                             If set to NULL no next object will be focused in specified direction (focus is
+ *                             set back to the list)
+ * @param[in]  dir                             Direction
+ * @param[in]  add_reverse_link        Should reverse direction be added?
+ * @param[in]  reverse_dir             Reverse direction
+ */
 void listmgr_set_list_next_focus(struct listmgr *listmgr, const char *list_id,
                Evas_Object *obj_to_focus, Elm_Focus_Direction dir);
 
+bool listmgr_update_grid(struct listmgr *listmgr, const char *list_id);
+
 void listmgr_add_inner_grid_cb(struct listmgr *listmgr, const char *list_id,
                input_handler *handler, void *data);
 
index 4bef6e3..0469867 100644 (file)
 #ifndef __AIR_SETTINGS_DATA_LOCATION_H__
 #define __AIR_SETTINGS_DATA_LOCATION_H__
 
+#define LOCATION_LIST_ID "LIST_LOCATION"
+
 #include <stdbool.h>
+#include "common/listmgr.h"
 
 struct country_info_s {
        const char *country_code;
@@ -26,5 +29,7 @@ struct country_info_s {
 };
 
 struct data_class *get_location_data_class(void);
+void data_location_set_new_system_location(Elm_Object_Item *selected_item);
+void data_location_fill_list_data(struct listmgr *list_mgr, Elm_Object_Item **get_country, const char *lang);
 
 #endif /* __AIR_SETTINGS_DATA_LOCATION_H__ */
index 8663f5e..f3a3a54 100644 (file)
 #define STR_WAKEUP_TIMER "Wake up timer"
 #define STR_WAKEUP_TIMER_DES1 "You can set wake up timer."
 #define STR_WAKEUP_TIMER_DES2 "If you set wake up timer, TV will be turned on on your timer."
+#define STR_CHANGE_PINCODE "Change Pincode"
+#define STR_RESET "Reset"
 
 #define STR_SETUP "Setup"
 #define STR_AUTO "Auto"
index 825c855..1a5eeaf 100644 (file)
@@ -17,6 +17,8 @@
 #ifndef __AIR_SETTINGS_LAYOUT_H__
 #define __AIR_SETTINGS_LAYOUT_H__
 
+#include "common/layoutmgr.h"
+
 enum layout_type {
        LAYOUT_PICTURE = 0,
        LAYOUT_SOUND,
index ede11d8..8cd0637 100644 (file)
--- a/po/en.po
+++ b/po/en.po
@@ -1,750 +1,3 @@
-msgid "IDS_COUNTRY_NAME_AF"
-msgstr "Afghanistan"
-
-msgid "IDS_COUNTRY_NAME_AX"
-msgstr "Åland Islands"
-
-msgid "IDS_COUNTRY_NAME_AL"
-msgstr "Albania"
-
-msgid "IDS_COUNTRY_NAME_DZ"
-msgstr "Algeria"
-
-msgid "IDS_COUNTRY_NAME_AS"
-msgstr "American Samoa"
-
-msgid "IDS_COUNTRY_NAME_AD"
-msgstr "Andorra"
-
-msgid "IDS_COUNTRY_NAME_AO"
-msgstr "Angola"
-
-msgid "IDS_COUNTRY_NAME_AI"
-msgstr "Anguilla"
-
-msgid "IDS_COUNTRY_NAME_AQ"
-msgstr "Antarctica"
-
-msgid "IDS_COUNTRY_NAME_AG"
-msgstr "Antigua and Barbuda"
-
-msgid "IDS_COUNTRY_NAME_AR"
-msgstr "Argentina"
-
-msgid "IDS_COUNTRY_NAME_AM"
-msgstr "Armenia"
-
-msgid "IDS_COUNTRY_NAME_AW"
-msgstr "Aruba"
-
-msgid "IDS_COUNTRY_NAME_AU"
-msgstr "Australia"
-
-msgid "IDS_COUNTRY_NAME_AT"
-msgstr "Austria"
-
-msgid "IDS_COUNTRY_NAME_AZ"
-msgstr "Azerbaijan"
-
-msgid "IDS_COUNTRY_NAME_BS"
-msgstr "Bahamas"
-
-msgid "IDS_COUNTRY_NAME_BH"
-msgstr "Bahrain"
-
-msgid "IDS_COUNTRY_NAME_BD"
-msgstr "Bangladesh"
-
-msgid "IDS_COUNTRY_NAME_BB"
-msgstr "Barbados"
-
-msgid "IDS_COUNTRY_NAME_BY"
-msgstr "Belarus"
-
-msgid "IDS_COUNTRY_NAME_BE"
-msgstr "Belgium"
-
-msgid "IDS_COUNTRY_NAME_BZ"
-msgstr "Belize"
-
-msgid "IDS_COUNTRY_NAME_BJ"
-msgstr "Benin"
-
-msgid "IDS_COUNTRY_NAME_BM"
-msgstr "Bermuda"
-
-msgid "IDS_COUNTRY_NAME_BT"
-msgstr "Bhutan"
-
-msgid "IDS_COUNTRY_NAME_BO"
-msgstr "Bolivia"
-
-msgid "IDS_COUNTRY_NAME_BQ"
-msgstr "Bonaire, Sint Eustatius and Saba"
-
-msgid "IDS_COUNTRY_NAME_BA"
-msgstr "Bosnia and Herzegovina"
-
-msgid "IDS_COUNTRY_NAME_BW"
-msgstr "Botswana"
-
-msgid "IDS_COUNTRY_NAME_BV"
-msgstr "Bouvet Island"
-
-msgid "IDS_COUNTRY_NAME_BR"
-msgstr "Brazil"
-
-msgid "IDS_COUNTRY_NAME_IO"
-msgstr "British Indian Ocean Territory"
-
-msgid "IDS_COUNTRY_NAME_BN"
-msgstr "Brunei Darussalam"
-
-msgid "IDS_COUNTRY_NAME_BG"
-msgstr "Bulgaria"
-
-msgid "IDS_COUNTRY_NAME_BF"
-msgstr "Burkina Faso"
-
-msgid "IDS_COUNTRY_NAME_BI"
-msgstr "Burundi"
-
-msgid "IDS_COUNTRY_NAME_CV"
-msgstr "Cabo Verde"
-
-msgid "IDS_COUNTRY_NAME_KH"
-msgstr "Cambodia"
-
-msgid "IDS_COUNTRY_NAME_CM"
-msgstr "Cameroon"
-
-msgid "IDS_COUNTRY_NAME_CA"
-msgstr "Canada"
-
-msgid "IDS_COUNTRY_NAME_KY"
-msgstr "Cayman Islands"
-
-msgid "IDS_COUNTRY_NAME_CF"
-msgstr "Central African Republic"
-
-msgid "IDS_COUNTRY_NAME_TD"
-msgstr "Chad"
-
-msgid "IDS_COUNTRY_NAME_CL"
-msgstr "Chile"
-
-msgid "IDS_COUNTRY_NAME_CN"
-msgstr "China"
-
-msgid "IDS_COUNTRY_NAME_CX"
-msgstr "Christmas Island"
-
-msgid "IDS_COUNTRY_NAME_CC"
-msgstr "Cocos (Keeling) Islands"
-
-msgid "IDS_COUNTRY_NAME_CO"
-msgstr "Colombia"
-
-msgid "IDS_COUNTRY_NAME_KM"
-msgstr "Comoros"
-
-msgid "IDS_COUNTRY_NAME_CD"
-msgstr "Democratic Republic of the Congo"
-
-msgid "IDS_COUNTRY_NAME_CG"
-msgstr "Republic of the Congo"
-
-msgid "IDS_COUNTRY_NAME_CK"
-msgstr "Cook Islands"
-
-msgid "IDS_COUNTRY_NAME_CR"
-msgstr "Costa Rica"
-
-msgid "IDS_COUNTRY_NAME_CI"
-msgstr "Côte d'Ivoire"
-
-msgid "IDS_COUNTRY_NAME_HR"
-msgstr "Croatia"
-
-msgid "IDS_COUNTRY_NAME_CU"
-msgstr "Cuba"
-
-msgid "IDS_COUNTRY_NAME_CW"
-msgstr "Curaçao"
-
-msgid "IDS_COUNTRY_NAME_CY"
-msgstr "Cyprus"
-
-msgid "IDS_COUNTRY_NAME_CZ"
-msgstr "Czech Republic"
-
-msgid "IDS_COUNTRY_NAME_DK"
-msgstr "Denmark"
-
-msgid "IDS_COUNTRY_NAME_DJ"
-msgstr "Djibouti"
-
-msgid "IDS_COUNTRY_NAME_DM"
-msgstr "Dominica"
-
-msgid "IDS_COUNTRY_NAME_DO"
-msgstr "Dominican Republic"
-
-msgid "IDS_COUNTRY_NAME_EC"
-msgstr "Ecuador"
-
-msgid "IDS_COUNTRY_NAME_EG"
-msgstr "Egypt"
-
-msgid "IDS_COUNTRY_NAME_SV"
-msgstr "El Salvador"
-
-msgid "IDS_COUNTRY_NAME_GQ"
-msgstr "Equatorial Guinea"
-
-msgid "IDS_COUNTRY_NAME_ER"
-msgstr "Eritrea"
-
-msgid "IDS_COUNTRY_NAME_EE"
-msgstr "Estonia"
-
-msgid "IDS_COUNTRY_NAME_ET"
-msgstr "Ethiopia"
-
-msgid "IDS_COUNTRY_NAME_FK"
-msgstr "Falkland Islands [Malvinas]"
-
-msgid "IDS_COUNTRY_NAME_FO"
-msgstr "Faroe Islands"
-
-msgid "IDS_COUNTRY_NAME_FJ"
-msgstr "Fiji"
-
-msgid "IDS_COUNTRY_NAME_FI"
-msgstr "Finland"
-
-msgid "IDS_COUNTRY_NAME_FR"
-msgstr "France"
-
-msgid "IDS_COUNTRY_NAME_GF"
-msgstr "French Guiana"
-
-msgid "IDS_COUNTRY_NAME_PF"
-msgstr "French Polynesia"
-
-msgid "IDS_COUNTRY_NAME_TF"
-msgstr "French Southern Territories"
-
-msgid "IDS_COUNTRY_NAME_GA"
-msgstr "Gabon"
-
-msgid "IDS_COUNTRY_NAME_GM"
-msgstr "Gambia"
-
-msgid "IDS_COUNTRY_NAME_GE"
-msgstr "Georgia"
-
-msgid "IDS_COUNTRY_NAME_DE"
-msgstr "Germany"
-
-msgid "IDS_COUNTRY_NAME_GH"
-msgstr "Ghana"
-
-msgid "IDS_COUNTRY_NAME_GI"
-msgstr "Gibraltar"
-
-msgid "IDS_COUNTRY_NAME_GR"
-msgstr "Greece"
-
-msgid "IDS_COUNTRY_NAME_GL"
-msgstr "Greenland"
-
-msgid "IDS_COUNTRY_NAME_GD"
-msgstr "Grenada"
-
-msgid "IDS_COUNTRY_NAME_GP"
-msgstr "Guadeloupe"
-
-msgid "IDS_COUNTRY_NAME_GU"
-msgstr "Guam"
-
-msgid "IDS_COUNTRY_NAME_GT"
-msgstr "Guatemala"
-
-msgid "IDS_COUNTRY_NAME_GG"
-msgstr "Guernsey"
-
-msgid "IDS_COUNTRY_NAME_GN"
-msgstr "Guinea"
-
-msgid "IDS_COUNTRY_NAME_GW"
-msgstr "Guinea-Bissau"
-
-msgid "IDS_COUNTRY_NAME_GY"
-msgstr "Guyana"
-
-msgid "IDS_COUNTRY_NAME_HT"
-msgstr "Haiti"
-
-msgid "IDS_COUNTRY_NAME_HM"
-msgstr "Heard Island and McDonald Islands"
-
-msgid "IDS_COUNTRY_NAME_VA"
-msgstr "Holy See"
-
-msgid "IDS_COUNTRY_NAME_HN"
-msgstr "Honduras"
-
-msgid "IDS_COUNTRY_NAME_HK"
-msgstr "Hong Kong"
-
-msgid "IDS_COUNTRY_NAME_HU"
-msgstr "Hungary"
-
-msgid "IDS_COUNTRY_NAME_IS"
-msgstr "Iceland"
-
-msgid "IDS_COUNTRY_NAME_IN"
-msgstr "India"
-
-msgid "IDS_COUNTRY_NAME_ID"
-msgstr "Indonesia"
-
-msgid "IDS_COUNTRY_NAME_IR"
-msgstr "Iran"
-
-msgid "IDS_COUNTRY_NAME_IQ"
-msgstr "Iraq"
-
-msgid "IDS_COUNTRY_NAME_IE"
-msgstr "Ireland"
-
-msgid "IDS_COUNTRY_NAME_IM"
-msgstr "Isle of Man"
-
-msgid "IDS_COUNTRY_NAME_IL"
-msgstr "Israel"
-
-msgid "IDS_COUNTRY_NAME_IT"
-msgstr "Italy"
-
-msgid "IDS_COUNTRY_NAME_JM"
-msgstr "Jamaica"
-
-msgid "IDS_COUNTRY_NAME_JP"
-msgstr "Japan"
-
-msgid "IDS_COUNTRY_NAME_JE"
-msgstr "Jersey"
-
-msgid "IDS_COUNTRY_NAME_JO"
-msgstr "Jordan"
-
-msgid "IDS_COUNTRY_NAME_KZ"
-msgstr "Kazakhstan"
-
-msgid "IDS_COUNTRY_NAME_KE"
-msgstr "Kenya"
-
-msgid "IDS_COUNTRY_NAME_KI"
-msgstr "Kiribati"
-
-msgid "IDS_COUNTRY_NAME_KP"
-msgstr "Democratic People's Republic of Korea"
-
-msgid "IDS_COUNTRY_NAME_KR"
-msgstr "Republic of Korea"
-
-msgid "IDS_COUNTRY_NAME_KW"
-msgstr "Kuwait"
-
-msgid "IDS_COUNTRY_NAME_KG"
-msgstr "Kyrgyzstan"
-
-msgid "IDS_COUNTRY_NAME_LA"
-msgstr "Lao People's Democratic Republic"
-
-msgid "IDS_COUNTRY_NAME_LV"
-msgstr "Latvia"
-
-msgid "IDS_COUNTRY_NAME_LB"
-msgstr "Lebanon"
-
-msgid "IDS_COUNTRY_NAME_LS"
-msgstr "Lesotho"
-
-msgid "IDS_COUNTRY_NAME_LR"
-msgstr "Liberia"
-
-msgid "IDS_COUNTRY_NAME_LY"
-msgstr "Libya"
-
-msgid "IDS_COUNTRY_NAME_LI"
-msgstr "Liechtenstein"
-
-msgid "IDS_COUNTRY_NAME_LT"
-msgstr "Lithuania"
-
-msgid "IDS_COUNTRY_NAME_LU"
-msgstr "Luxembourg"
-
-msgid "IDS_COUNTRY_NAME_MO"
-msgstr "Macao"
-
-msgid "IDS_COUNTRY_NAME_MK"
-msgstr "Macedonia"
-
-msgid "IDS_COUNTRY_NAME_MG"
-msgstr "Madagascar"
-
-msgid "IDS_COUNTRY_NAME_MW"
-msgstr "Malawi"
-
-msgid "IDS_COUNTRY_NAME_MY"
-msgstr "Malaysia"
-
-msgid "IDS_COUNTRY_NAME_MV"
-msgstr "Maldives"
-
-msgid "IDS_COUNTRY_NAME_ML"
-msgstr "Mali"
-
-msgid "IDS_COUNTRY_NAME_MT"
-msgstr "Malta"
-
-msgid "IDS_COUNTRY_NAME_MH"
-msgstr "Marshall Islands"
-
-msgid "IDS_COUNTRY_NAME_MQ"
-msgstr "Martinique"
-
-msgid "IDS_COUNTRY_NAME_MR"
-msgstr "Mauritania"
-
-msgid "IDS_COUNTRY_NAME_MU"
-msgstr "Mauritius"
-
-msgid "IDS_COUNTRY_NAME_YT"
-msgstr "Mayotte"
-
-msgid "IDS_COUNTRY_NAME_MX"
-msgstr "Mexico"
-
-msgid "IDS_COUNTRY_NAME_FM"
-msgstr "Micronesia"
-
-msgid "IDS_COUNTRY_NAME_MD"
-msgstr "Moldova"
-
-msgid "IDS_COUNTRY_NAME_MC"
-msgstr "Monaco"
-
-msgid "IDS_COUNTRY_NAME_MN"
-msgstr "Mongolia"
-
-msgid "IDS_COUNTRY_NAME_ME"
-msgstr "Montenegro"
-
-msgid "IDS_COUNTRY_NAME_MS"
-msgstr "Montserrat"
-
-msgid "IDS_COUNTRY_NAME_MA"
-msgstr "Morocco"
-
-msgid "IDS_COUNTRY_NAME_MZ"
-msgstr "Mozambique"
-
-msgid "IDS_COUNTRY_NAME_MM"
-msgstr "Myanmar"
-
-msgid "IDS_COUNTRY_NAME_NA"
-msgstr "Namibia"
-
-msgid "IDS_COUNTRY_NAME_NR"
-msgstr "Nauru"
-
-msgid "IDS_COUNTRY_NAME_NP"
-msgstr "Nepal"
-
-msgid "IDS_COUNTRY_NAME_NL"
-msgstr "Netherlands"
-
-msgid "IDS_COUNTRY_NAME_NC"
-msgstr "New Caledonia"
-
-msgid "IDS_COUNTRY_NAME_NZ"
-msgstr "New Zealand"
-
-msgid "IDS_COUNTRY_NAME_NI"
-msgstr "Nicaragua"
-
-msgid "IDS_COUNTRY_NAME_NE"
-msgstr "Niger"
-
-msgid "IDS_COUNTRY_NAME_NG"
-msgstr "Nigeria"
-
-msgid "IDS_COUNTRY_NAME_NU"
-msgstr "Niue"
-
-msgid "IDS_COUNTRY_NAME_NF"
-msgstr "Norfolk Island"
-
-msgid "IDS_COUNTRY_NAME_MP"
-msgstr "Northern Mariana Islands"
-
-msgid "IDS_COUNTRY_NAME_NO"
-msgstr "Norway"
-
-msgid "IDS_COUNTRY_NAME_OM"
-msgstr "Oman"
-
-msgid "IDS_COUNTRY_NAME_PK"
-msgstr "Pakistan"
-
-msgid "IDS_COUNTRY_NAME_PW"
-msgstr "Palau"
-
-msgid "IDS_COUNTRY_NAME_PS"
-msgstr "Palestine, State of"
-
-msgid "IDS_COUNTRY_NAME_PA"
-msgstr "Panama"
-
-msgid "IDS_COUNTRY_NAME_PG"
-msgstr "Papua New Guinea"
-
-msgid "IDS_COUNTRY_NAME_PY"
-msgstr "Paraguay"
-
-msgid "IDS_COUNTRY_NAME_PE"
-msgstr "Peru"
-
-msgid "IDS_COUNTRY_NAME_PH"
-msgstr "Philippines"
-
-msgid "IDS_COUNTRY_NAME_PN"
-msgstr "Pitcairn"
-
-msgid "IDS_COUNTRY_NAME_PL"
-msgstr "Poland"
-
-msgid "IDS_COUNTRY_NAME_PT"
-msgstr "Portugal"
-
-msgid "IDS_COUNTRY_NAME_PR"
-msgstr "Puerto Rico"
-
-msgid "IDS_COUNTRY_NAME_QA"
-msgstr "Qatar"
-
-msgid "IDS_COUNTRY_NAME_RE"
-msgstr "Réunion"
-
-msgid "IDS_COUNTRY_NAME_RO"
-msgstr "Romania"
-
-msgid "IDS_COUNTRY_NAME_RU"
-msgstr "Russian Federation"
-
-msgid "IDS_COUNTRY_NAME_RW"
-msgstr "Rwanda"
-
-msgid "IDS_COUNTRY_NAME_BL"
-msgstr "Saint Barthélemy"
-
-msgid "IDS_COUNTRY_NAME_SH"
-msgstr "Saint Helena"
-
-msgid "IDS_COUNTRY_NAME_KN"
-msgstr "Saint Kitts and Nevis"
-
-msgid "IDS_COUNTRY_NAME_LC"
-msgstr "Saint Lucia"
-
-msgid "IDS_COUNTRY_NAME_MF"
-msgstr "Saint Martin (French part)"
-
-msgid "IDS_COUNTRY_NAME_PM"
-msgstr "Saint Pierre and Miquelon"
-
-msgid "IDS_COUNTRY_NAME_VC"
-msgstr "Saint Vincent and the Grenadines"
-
-msgid "IDS_COUNTRY_NAME_WS"
-msgstr "Samoa"
-
-msgid "IDS_COUNTRY_NAME_SM"
-msgstr "San Marino"
-
-msgid "IDS_COUNTRY_NAME_ST"
-msgstr "Sao Tome and Principe"
-
-msgid "IDS_COUNTRY_NAME_SA"
-msgstr "Saudi Arabia"
-
-msgid "IDS_COUNTRY_NAME_SN"
-msgstr "Senegal"
-
-msgid "IDS_COUNTRY_NAME_RS"
-msgstr "Serbia"
-
-msgid "IDS_COUNTRY_NAME_SC"
-msgstr "Seychelles"
-
-msgid "IDS_COUNTRY_NAME_SL"
-msgstr "Sierra Leone"
-
-msgid "IDS_COUNTRY_NAME_SG"
-msgstr "Singapore"
-
-msgid "IDS_COUNTRY_NAME_SX"
-msgstr "Sint Maarten (Dutch part)"
-
-msgid "IDS_COUNTRY_NAME_SK"
-msgstr "Slovakia"
-
-msgid "IDS_COUNTRY_NAME_SI"
-msgstr "Slovenia"
-
-msgid "IDS_COUNTRY_NAME_SB"
-msgstr "Solomon Islands"
-
-msgid "IDS_COUNTRY_NAME_SO"
-msgstr "Somalia"
-
-msgid "IDS_COUNTRY_NAME_ZA"
-msgstr "South Africa"
-
-msgid "IDS_COUNTRY_NAME_GS"
-msgstr "South Georgia and the South Sandwich Islands"
-
-msgid "IDS_COUNTRY_NAME_SS"
-msgstr "South Sudan"
-
-msgid "IDS_COUNTRY_NAME_ES"
-msgstr "Spain"
-
-msgid "IDS_COUNTRY_NAME_LK"
-msgstr "Sri Lanka"
-
-msgid "IDS_COUNTRY_NAME_SD"
-msgstr "Sudan"
-
-msgid "IDS_COUNTRY_NAME_SR"
-msgstr "Suriname"
-
-msgid "IDS_COUNTRY_NAME_SJ"
-msgstr "Svalbard and Jan Mayen"
-
-msgid "IDS_COUNTRY_NAME_SZ"
-msgstr "Swaziland"
-
-msgid "IDS_COUNTRY_NAME_SE"
-msgstr "Sweden"
-
-msgid "IDS_COUNTRY_NAME_CH"
-msgstr "Switzerland"
-
-msgid "IDS_COUNTRY_NAME_SY"
-msgstr "Syrian Arab Republic"
-
-msgid "IDS_COUNTRY_NAME_TW"
-msgstr "Taiwan (Province of China)"
-
-msgid "IDS_COUNTRY_NAME_TJ"
-msgstr "Tajikistan"
-
-msgid "IDS_COUNTRY_NAME_TZ"
-msgstr "Tanzania, United Republic of"
-
-msgid "IDS_COUNTRY_NAME_TH"
-msgstr "Thailand"
-
-msgid "IDS_COUNTRY_NAME_TL"
-msgstr "Timor-Leste"
-
-msgid "IDS_COUNTRY_NAME_TG"
-msgstr "Togo"
-
-msgid "IDS_COUNTRY_NAME_TK"
-msgstr "Tokelau"
-
-msgid "IDS_COUNTRY_NAME_TO"
-msgstr "Tonga"
-
-msgid "IDS_COUNTRY_NAME_TT"
-msgstr "Trinidad and Tobago"
-
-msgid "IDS_COUNTRY_NAME_TN"
-msgstr "Tunisia"
-
-msgid "IDS_COUNTRY_NAME_TR"
-msgstr "Turkey"
-
-msgid "IDS_COUNTRY_NAME_TM"
-msgstr "Turkmenistan"
-
-msgid "IDS_COUNTRY_NAME_TC"
-msgstr "Turks and Caicos Islands"
-
-msgid "IDS_COUNTRY_NAME_TV"
-msgstr "Tuvalu"
-
-msgid "IDS_COUNTRY_NAME_UG"
-msgstr "Uganda"
-
-msgid "IDS_COUNTRY_NAME_UA"
-msgstr "Ukraine"
-
-msgid "IDS_COUNTRY_NAME_AE"
-msgstr "United Arab Emirates"
-
-msgid "IDS_COUNTRY_NAME_GB"
-msgstr "United Kingdom"
-
-msgid "IDS_COUNTRY_NAME_UM"
-msgstr "United States Minor Outlying Islands"
-
-msgid "IDS_COUNTRY_NAME_US"
-msgstr "United States of America"
-
-msgid "IDS_COUNTRY_NAME_UY"
-msgstr "Uruguay"
-
-msgid "IDS_COUNTRY_NAME_UZ"
-msgstr "Uzbekistan"
-
-msgid "IDS_COUNTRY_NAME_VU"
-msgstr "Vanuatu"
-
-msgid "IDS_COUNTRY_NAME_VE"
-msgstr "Venezuela"
-
-msgid "IDS_COUNTRY_NAME_VN"
-msgstr "Viet Nam"
-
-msgid "IDS_COUNTRY_NAME_VG"
-msgstr "Virgin Islands (British)"
-
-msgid "IDS_COUNTRY_NAME_VI"
-msgstr "Virgin Islands (U.S.)"
-
-msgid "IDS_COUNTRY_NAME_WF"
-msgstr "Wallis and Futuna"
-
-msgid "IDS_COUNTRY_NAME_EH"
-msgstr "Western Sahara"
-
-msgid "IDS_COUNTRY_NAME_YE"
-msgstr "Yemen"
-
-msgid "IDS_COUNTRY_NAME_ZM"
-msgstr "Zambia"
-
-msgid "IDS_COUNTRY_NAME_ZW"
-msgstr "Zimbabwe"
-
 msgid "IDS_ST_BODY_1_MINUTE"
 msgstr "1 minute"
 
index 03858c6..d170b14 100644 (file)
@@ -1,750 +1,3 @@
-msgid "IDS_COUNTRY_NAME_AF"
-msgstr "Afghanistan"
-
-msgid "IDS_COUNTRY_NAME_AX"
-msgstr "Åland Islands"
-
-msgid "IDS_COUNTRY_NAME_AL"
-msgstr "Albania"
-
-msgid "IDS_COUNTRY_NAME_DZ"
-msgstr "Algeria"
-
-msgid "IDS_COUNTRY_NAME_AS"
-msgstr "American Samoa"
-
-msgid "IDS_COUNTRY_NAME_AD"
-msgstr "Andorra"
-
-msgid "IDS_COUNTRY_NAME_AO"
-msgstr "Angola"
-
-msgid "IDS_COUNTRY_NAME_AI"
-msgstr "Anguilla"
-
-msgid "IDS_COUNTRY_NAME_AQ"
-msgstr "Antarctica"
-
-msgid "IDS_COUNTRY_NAME_AG"
-msgstr "Antigua and Barbuda"
-
-msgid "IDS_COUNTRY_NAME_AR"
-msgstr "Argentina"
-
-msgid "IDS_COUNTRY_NAME_AM"
-msgstr "Armenia"
-
-msgid "IDS_COUNTRY_NAME_AW"
-msgstr "Aruba"
-
-msgid "IDS_COUNTRY_NAME_AU"
-msgstr "Australia"
-
-msgid "IDS_COUNTRY_NAME_AT"
-msgstr "Austria"
-
-msgid "IDS_COUNTRY_NAME_AZ"
-msgstr "Azerbaijan"
-
-msgid "IDS_COUNTRY_NAME_BS"
-msgstr "Bahamas"
-
-msgid "IDS_COUNTRY_NAME_BH"
-msgstr "Bahrain"
-
-msgid "IDS_COUNTRY_NAME_BD"
-msgstr "Bangladesh"
-
-msgid "IDS_COUNTRY_NAME_BB"
-msgstr "Barbados"
-
-msgid "IDS_COUNTRY_NAME_BY"
-msgstr "Belarus"
-
-msgid "IDS_COUNTRY_NAME_BE"
-msgstr "Belgium"
-
-msgid "IDS_COUNTRY_NAME_BZ"
-msgstr "Belize"
-
-msgid "IDS_COUNTRY_NAME_BJ"
-msgstr "Benin"
-
-msgid "IDS_COUNTRY_NAME_BM"
-msgstr "Bermuda"
-
-msgid "IDS_COUNTRY_NAME_BT"
-msgstr "Bhutan"
-
-msgid "IDS_COUNTRY_NAME_BO"
-msgstr "Bolivia"
-
-msgid "IDS_COUNTRY_NAME_BQ"
-msgstr "Bonaire, Sint Eustatius and Saba"
-
-msgid "IDS_COUNTRY_NAME_BA"
-msgstr "Bosnia and Herzegovina"
-
-msgid "IDS_COUNTRY_NAME_BW"
-msgstr "Botswana"
-
-msgid "IDS_COUNTRY_NAME_BV"
-msgstr "Bouvet Island"
-
-msgid "IDS_COUNTRY_NAME_BR"
-msgstr "Brazil"
-
-msgid "IDS_COUNTRY_NAME_IO"
-msgstr "British Indian Ocean Territory"
-
-msgid "IDS_COUNTRY_NAME_BN"
-msgstr "Brunei Darussalam"
-
-msgid "IDS_COUNTRY_NAME_BG"
-msgstr "Bulgaria"
-
-msgid "IDS_COUNTRY_NAME_BF"
-msgstr "Burkina Faso"
-
-msgid "IDS_COUNTRY_NAME_BI"
-msgstr "Burundi"
-
-msgid "IDS_COUNTRY_NAME_CV"
-msgstr "Cabo Verde"
-
-msgid "IDS_COUNTRY_NAME_KH"
-msgstr "Cambodia"
-
-msgid "IDS_COUNTRY_NAME_CM"
-msgstr "Cameroon"
-
-msgid "IDS_COUNTRY_NAME_CA"
-msgstr "Canada"
-
-msgid "IDS_COUNTRY_NAME_KY"
-msgstr "Cayman Islands"
-
-msgid "IDS_COUNTRY_NAME_CF"
-msgstr "Central African Republic"
-
-msgid "IDS_COUNTRY_NAME_TD"
-msgstr "Chad"
-
-msgid "IDS_COUNTRY_NAME_CL"
-msgstr "Chile"
-
-msgid "IDS_COUNTRY_NAME_CN"
-msgstr "China"
-
-msgid "IDS_COUNTRY_NAME_CX"
-msgstr "Christmas Island"
-
-msgid "IDS_COUNTRY_NAME_CC"
-msgstr "Cocos (Keeling) Islands"
-
-msgid "IDS_COUNTRY_NAME_CO"
-msgstr "Colombia"
-
-msgid "IDS_COUNTRY_NAME_KM"
-msgstr "Comoros"
-
-msgid "IDS_COUNTRY_NAME_CD"
-msgstr "Democratic Republic of the Congo"
-
-msgid "IDS_COUNTRY_NAME_CG"
-msgstr "Republic of the Congo"
-
-msgid "IDS_COUNTRY_NAME_CK"
-msgstr "Cook Islands"
-
-msgid "IDS_COUNTRY_NAME_CR"
-msgstr "Costa Rica"
-
-msgid "IDS_COUNTRY_NAME_CI"
-msgstr "Côte d'Ivoire"
-
-msgid "IDS_COUNTRY_NAME_HR"
-msgstr "Croatia"
-
-msgid "IDS_COUNTRY_NAME_CU"
-msgstr "Cuba"
-
-msgid "IDS_COUNTRY_NAME_CW"
-msgstr "Curaçao"
-
-msgid "IDS_COUNTRY_NAME_CY"
-msgstr "Cyprus"
-
-msgid "IDS_COUNTRY_NAME_CZ"
-msgstr "Czech Republic"
-
-msgid "IDS_COUNTRY_NAME_DK"
-msgstr "Denmark"
-
-msgid "IDS_COUNTRY_NAME_DJ"
-msgstr "Djibouti"
-
-msgid "IDS_COUNTRY_NAME_DM"
-msgstr "Dominica"
-
-msgid "IDS_COUNTRY_NAME_DO"
-msgstr "Dominican Republic"
-
-msgid "IDS_COUNTRY_NAME_EC"
-msgstr "Ecuador"
-
-msgid "IDS_COUNTRY_NAME_EG"
-msgstr "Egypt"
-
-msgid "IDS_COUNTRY_NAME_SV"
-msgstr "El Salvador"
-
-msgid "IDS_COUNTRY_NAME_GQ"
-msgstr "Equatorial Guinea"
-
-msgid "IDS_COUNTRY_NAME_ER"
-msgstr "Eritrea"
-
-msgid "IDS_COUNTRY_NAME_EE"
-msgstr "Estonia"
-
-msgid "IDS_COUNTRY_NAME_ET"
-msgstr "Ethiopia"
-
-msgid "IDS_COUNTRY_NAME_FK"
-msgstr "Falkland Islands [Malvinas]"
-
-msgid "IDS_COUNTRY_NAME_FO"
-msgstr "Faroe Islands"
-
-msgid "IDS_COUNTRY_NAME_FJ"
-msgstr "Fiji"
-
-msgid "IDS_COUNTRY_NAME_FI"
-msgstr "Finland"
-
-msgid "IDS_COUNTRY_NAME_FR"
-msgstr "France"
-
-msgid "IDS_COUNTRY_NAME_GF"
-msgstr "French Guiana"
-
-msgid "IDS_COUNTRY_NAME_PF"
-msgstr "French Polynesia"
-
-msgid "IDS_COUNTRY_NAME_TF"
-msgstr "French Southern Territories"
-
-msgid "IDS_COUNTRY_NAME_GA"
-msgstr "Gabon"
-
-msgid "IDS_COUNTRY_NAME_GM"
-msgstr "Gambia"
-
-msgid "IDS_COUNTRY_NAME_GE"
-msgstr "Georgia"
-
-msgid "IDS_COUNTRY_NAME_DE"
-msgstr "Germany"
-
-msgid "IDS_COUNTRY_NAME_GH"
-msgstr "Ghana"
-
-msgid "IDS_COUNTRY_NAME_GI"
-msgstr "Gibraltar"
-
-msgid "IDS_COUNTRY_NAME_GR"
-msgstr "Greece"
-
-msgid "IDS_COUNTRY_NAME_GL"
-msgstr "Greenland"
-
-msgid "IDS_COUNTRY_NAME_GD"
-msgstr "Grenada"
-
-msgid "IDS_COUNTRY_NAME_GP"
-msgstr "Guadeloupe"
-
-msgid "IDS_COUNTRY_NAME_GU"
-msgstr "Guam"
-
-msgid "IDS_COUNTRY_NAME_GT"
-msgstr "Guatemala"
-
-msgid "IDS_COUNTRY_NAME_GG"
-msgstr "Guernsey"
-
-msgid "IDS_COUNTRY_NAME_GN"
-msgstr "Guinea"
-
-msgid "IDS_COUNTRY_NAME_GW"
-msgstr "Guinea-Bissau"
-
-msgid "IDS_COUNTRY_NAME_GY"
-msgstr "Guyana"
-
-msgid "IDS_COUNTRY_NAME_HT"
-msgstr "Haiti"
-
-msgid "IDS_COUNTRY_NAME_HM"
-msgstr "Heard Island and McDonald Islands"
-
-msgid "IDS_COUNTRY_NAME_VA"
-msgstr "Holy See"
-
-msgid "IDS_COUNTRY_NAME_HN"
-msgstr "Honduras"
-
-msgid "IDS_COUNTRY_NAME_HK"
-msgstr "Hong Kong"
-
-msgid "IDS_COUNTRY_NAME_HU"
-msgstr "Hungary"
-
-msgid "IDS_COUNTRY_NAME_IS"
-msgstr "Iceland"
-
-msgid "IDS_COUNTRY_NAME_IN"
-msgstr "India"
-
-msgid "IDS_COUNTRY_NAME_ID"
-msgstr "Indonesia"
-
-msgid "IDS_COUNTRY_NAME_IR"
-msgstr "Iran"
-
-msgid "IDS_COUNTRY_NAME_IQ"
-msgstr "Iraq"
-
-msgid "IDS_COUNTRY_NAME_IE"
-msgstr "Ireland"
-
-msgid "IDS_COUNTRY_NAME_IM"
-msgstr "Isle of Man"
-
-msgid "IDS_COUNTRY_NAME_IL"
-msgstr "Israel"
-
-msgid "IDS_COUNTRY_NAME_IT"
-msgstr "Italy"
-
-msgid "IDS_COUNTRY_NAME_JM"
-msgstr "Jamaica"
-
-msgid "IDS_COUNTRY_NAME_JP"
-msgstr "Japan"
-
-msgid "IDS_COUNTRY_NAME_JE"
-msgstr "Jersey"
-
-msgid "IDS_COUNTRY_NAME_JO"
-msgstr "Jordan"
-
-msgid "IDS_COUNTRY_NAME_KZ"
-msgstr "Kazakhstan"
-
-msgid "IDS_COUNTRY_NAME_KE"
-msgstr "Kenya"
-
-msgid "IDS_COUNTRY_NAME_KI"
-msgstr "Kiribati"
-
-msgid "IDS_COUNTRY_NAME_KP"
-msgstr "Democratic People's Republic of Korea"
-
-msgid "IDS_COUNTRY_NAME_KR"
-msgstr "Republic of Korea"
-
-msgid "IDS_COUNTRY_NAME_KW"
-msgstr "Kuwait"
-
-msgid "IDS_COUNTRY_NAME_KG"
-msgstr "Kyrgyzstan"
-
-msgid "IDS_COUNTRY_NAME_LA"
-msgstr "Lao People's Democratic Republic"
-
-msgid "IDS_COUNTRY_NAME_LV"
-msgstr "Latvia"
-
-msgid "IDS_COUNTRY_NAME_LB"
-msgstr "Lebanon"
-
-msgid "IDS_COUNTRY_NAME_LS"
-msgstr "Lesotho"
-
-msgid "IDS_COUNTRY_NAME_LR"
-msgstr "Liberia"
-
-msgid "IDS_COUNTRY_NAME_LY"
-msgstr "Libya"
-
-msgid "IDS_COUNTRY_NAME_LI"
-msgstr "Liechtenstein"
-
-msgid "IDS_COUNTRY_NAME_LT"
-msgstr "Lithuania"
-
-msgid "IDS_COUNTRY_NAME_LU"
-msgstr "Luxembourg"
-
-msgid "IDS_COUNTRY_NAME_MO"
-msgstr "Macao"
-
-msgid "IDS_COUNTRY_NAME_MK"
-msgstr "Macedonia"
-
-msgid "IDS_COUNTRY_NAME_MG"
-msgstr "Madagascar"
-
-msgid "IDS_COUNTRY_NAME_MW"
-msgstr "Malawi"
-
-msgid "IDS_COUNTRY_NAME_MY"
-msgstr "Malaysia"
-
-msgid "IDS_COUNTRY_NAME_MV"
-msgstr "Maldives"
-
-msgid "IDS_COUNTRY_NAME_ML"
-msgstr "Mali"
-
-msgid "IDS_COUNTRY_NAME_MT"
-msgstr "Malta"
-
-msgid "IDS_COUNTRY_NAME_MH"
-msgstr "Marshall Islands"
-
-msgid "IDS_COUNTRY_NAME_MQ"
-msgstr "Martinique"
-
-msgid "IDS_COUNTRY_NAME_MR"
-msgstr "Mauritania"
-
-msgid "IDS_COUNTRY_NAME_MU"
-msgstr "Mauritius"
-
-msgid "IDS_COUNTRY_NAME_YT"
-msgstr "Mayotte"
-
-msgid "IDS_COUNTRY_NAME_MX"
-msgstr "Mexico"
-
-msgid "IDS_COUNTRY_NAME_FM"
-msgstr "Micronesia"
-
-msgid "IDS_COUNTRY_NAME_MD"
-msgstr "Moldova"
-
-msgid "IDS_COUNTRY_NAME_MC"
-msgstr "Monaco"
-
-msgid "IDS_COUNTRY_NAME_MN"
-msgstr "Mongolia"
-
-msgid "IDS_COUNTRY_NAME_ME"
-msgstr "Montenegro"
-
-msgid "IDS_COUNTRY_NAME_MS"
-msgstr "Montserrat"
-
-msgid "IDS_COUNTRY_NAME_MA"
-msgstr "Morocco"
-
-msgid "IDS_COUNTRY_NAME_MZ"
-msgstr "Mozambique"
-
-msgid "IDS_COUNTRY_NAME_MM"
-msgstr "Myanmar"
-
-msgid "IDS_COUNTRY_NAME_NA"
-msgstr "Namibia"
-
-msgid "IDS_COUNTRY_NAME_NR"
-msgstr "Nauru"
-
-msgid "IDS_COUNTRY_NAME_NP"
-msgstr "Nepal"
-
-msgid "IDS_COUNTRY_NAME_NL"
-msgstr "Netherlands"
-
-msgid "IDS_COUNTRY_NAME_NC"
-msgstr "New Caledonia"
-
-msgid "IDS_COUNTRY_NAME_NZ"
-msgstr "New Zealand"
-
-msgid "IDS_COUNTRY_NAME_NI"
-msgstr "Nicaragua"
-
-msgid "IDS_COUNTRY_NAME_NE"
-msgstr "Niger"
-
-msgid "IDS_COUNTRY_NAME_NG"
-msgstr "Nigeria"
-
-msgid "IDS_COUNTRY_NAME_NU"
-msgstr "Niue"
-
-msgid "IDS_COUNTRY_NAME_NF"
-msgstr "Norfolk Island"
-
-msgid "IDS_COUNTRY_NAME_MP"
-msgstr "Northern Mariana Islands"
-
-msgid "IDS_COUNTRY_NAME_NO"
-msgstr "Norway"
-
-msgid "IDS_COUNTRY_NAME_OM"
-msgstr "Oman"
-
-msgid "IDS_COUNTRY_NAME_PK"
-msgstr "Pakistan"
-
-msgid "IDS_COUNTRY_NAME_PW"
-msgstr "Palau"
-
-msgid "IDS_COUNTRY_NAME_PS"
-msgstr "Palestine, State of"
-
-msgid "IDS_COUNTRY_NAME_PA"
-msgstr "Panama"
-
-msgid "IDS_COUNTRY_NAME_PG"
-msgstr "Papua New Guinea"
-
-msgid "IDS_COUNTRY_NAME_PY"
-msgstr "Paraguay"
-
-msgid "IDS_COUNTRY_NAME_PE"
-msgstr "Peru"
-
-msgid "IDS_COUNTRY_NAME_PH"
-msgstr "Philippines"
-
-msgid "IDS_COUNTRY_NAME_PN"
-msgstr "Pitcairn"
-
-msgid "IDS_COUNTRY_NAME_PL"
-msgstr "Poland"
-
-msgid "IDS_COUNTRY_NAME_PT"
-msgstr "Portugal"
-
-msgid "IDS_COUNTRY_NAME_PR"
-msgstr "Puerto Rico"
-
-msgid "IDS_COUNTRY_NAME_QA"
-msgstr "Qatar"
-
-msgid "IDS_COUNTRY_NAME_RE"
-msgstr "Réunion"
-
-msgid "IDS_COUNTRY_NAME_RO"
-msgstr "Romania"
-
-msgid "IDS_COUNTRY_NAME_RU"
-msgstr "Russian Federation"
-
-msgid "IDS_COUNTRY_NAME_RW"
-msgstr "Rwanda"
-
-msgid "IDS_COUNTRY_NAME_BL"
-msgstr "Saint Barthélemy"
-
-msgid "IDS_COUNTRY_NAME_SH"
-msgstr "Saint Helena"
-
-msgid "IDS_COUNTRY_NAME_KN"
-msgstr "Saint Kitts and Nevis"
-
-msgid "IDS_COUNTRY_NAME_LC"
-msgstr "Saint Lucia"
-
-msgid "IDS_COUNTRY_NAME_MF"
-msgstr "Saint Martin (French part)"
-
-msgid "IDS_COUNTRY_NAME_PM"
-msgstr "Saint Pierre and Miquelon"
-
-msgid "IDS_COUNTRY_NAME_VC"
-msgstr "Saint Vincent and the Grenadines"
-
-msgid "IDS_COUNTRY_NAME_WS"
-msgstr "Samoa"
-
-msgid "IDS_COUNTRY_NAME_SM"
-msgstr "San Marino"
-
-msgid "IDS_COUNTRY_NAME_ST"
-msgstr "Sao Tome and Principe"
-
-msgid "IDS_COUNTRY_NAME_SA"
-msgstr "Saudi Arabia"
-
-msgid "IDS_COUNTRY_NAME_SN"
-msgstr "Senegal"
-
-msgid "IDS_COUNTRY_NAME_RS"
-msgstr "Serbia"
-
-msgid "IDS_COUNTRY_NAME_SC"
-msgstr "Seychelles"
-
-msgid "IDS_COUNTRY_NAME_SL"
-msgstr "Sierra Leone"
-
-msgid "IDS_COUNTRY_NAME_SG"
-msgstr "Singapore"
-
-msgid "IDS_COUNTRY_NAME_SX"
-msgstr "Sint Maarten (Dutch part)"
-
-msgid "IDS_COUNTRY_NAME_SK"
-msgstr "Slovakia"
-
-msgid "IDS_COUNTRY_NAME_SI"
-msgstr "Slovenia"
-
-msgid "IDS_COUNTRY_NAME_SB"
-msgstr "Solomon Islands"
-
-msgid "IDS_COUNTRY_NAME_SO"
-msgstr "Somalia"
-
-msgid "IDS_COUNTRY_NAME_ZA"
-msgstr "South Africa"
-
-msgid "IDS_COUNTRY_NAME_GS"
-msgstr "South Georgia and the South Sandwich Islands"
-
-msgid "IDS_COUNTRY_NAME_SS"
-msgstr "South Sudan"
-
-msgid "IDS_COUNTRY_NAME_ES"
-msgstr "Spain"
-
-msgid "IDS_COUNTRY_NAME_LK"
-msgstr "Sri Lanka"
-
-msgid "IDS_COUNTRY_NAME_SD"
-msgstr "Sudan"
-
-msgid "IDS_COUNTRY_NAME_SR"
-msgstr "Suriname"
-
-msgid "IDS_COUNTRY_NAME_SJ"
-msgstr "Svalbard and Jan Mayen"
-
-msgid "IDS_COUNTRY_NAME_SZ"
-msgstr "Swaziland"
-
-msgid "IDS_COUNTRY_NAME_SE"
-msgstr "Sweden"
-
-msgid "IDS_COUNTRY_NAME_CH"
-msgstr "Switzerland"
-
-msgid "IDS_COUNTRY_NAME_SY"
-msgstr "Syrian Arab Republic"
-
-msgid "IDS_COUNTRY_NAME_TW"
-msgstr "Taiwan (Province of China)"
-
-msgid "IDS_COUNTRY_NAME_TJ"
-msgstr "Tajikistan"
-
-msgid "IDS_COUNTRY_NAME_TZ"
-msgstr "Tanzania, United Republic of"
-
-msgid "IDS_COUNTRY_NAME_TH"
-msgstr "Thailand"
-
-msgid "IDS_COUNTRY_NAME_TL"
-msgstr "Timor-Leste"
-
-msgid "IDS_COUNTRY_NAME_TG"
-msgstr "Togo"
-
-msgid "IDS_COUNTRY_NAME_TK"
-msgstr "Tokelau"
-
-msgid "IDS_COUNTRY_NAME_TO"
-msgstr "Tonga"
-
-msgid "IDS_COUNTRY_NAME_TT"
-msgstr "Trinidad and Tobago"
-
-msgid "IDS_COUNTRY_NAME_TN"
-msgstr "Tunisia"
-
-msgid "IDS_COUNTRY_NAME_TR"
-msgstr "Turkey"
-
-msgid "IDS_COUNTRY_NAME_TM"
-msgstr "Turkmenistan"
-
-msgid "IDS_COUNTRY_NAME_TC"
-msgstr "Turks and Caicos Islands"
-
-msgid "IDS_COUNTRY_NAME_TV"
-msgstr "Tuvalu"
-
-msgid "IDS_COUNTRY_NAME_UG"
-msgstr "Uganda"
-
-msgid "IDS_COUNTRY_NAME_UA"
-msgstr "Ukraine"
-
-msgid "IDS_COUNTRY_NAME_AE"
-msgstr "United Arab Emirates"
-
-msgid "IDS_COUNTRY_NAME_GB"
-msgstr "United Kingdom"
-
-msgid "IDS_COUNTRY_NAME_UM"
-msgstr "United States Minor Outlying Islands"
-
-msgid "IDS_COUNTRY_NAME_US"
-msgstr "United States of America"
-
-msgid "IDS_COUNTRY_NAME_UY"
-msgstr "Uruguay"
-
-msgid "IDS_COUNTRY_NAME_UZ"
-msgstr "Uzbekistan"
-
-msgid "IDS_COUNTRY_NAME_VU"
-msgstr "Vanuatu"
-
-msgid "IDS_COUNTRY_NAME_VE"
-msgstr "Venezuela"
-
-msgid "IDS_COUNTRY_NAME_VN"
-msgstr "Viet Nam"
-
-msgid "IDS_COUNTRY_NAME_VG"
-msgstr "Virgin Islands (British)"
-
-msgid "IDS_COUNTRY_NAME_VI"
-msgstr "Virgin Islands (U.S.)"
-
-msgid "IDS_COUNTRY_NAME_WF"
-msgstr "Wallis and Futuna"
-
-msgid "IDS_COUNTRY_NAME_EH"
-msgstr "Western Sahara"
-
-msgid "IDS_COUNTRY_NAME_YE"
-msgstr "Yemen"
-
-msgid "IDS_COUNTRY_NAME_ZM"
-msgstr "Zambia"
-
-msgid "IDS_COUNTRY_NAME_ZW"
-msgstr "Zimbabwe"
-
 msgid "IDS_ST_BODY_1_MINUTE"
 msgstr "1 minute"
 
index f6d4dd2..01bc01f 100644 (file)
@@ -96,29 +96,12 @@ group {
                }
 
                part {
-                       name, "padding.thumb.text.left";
-                       type, SPACER;
-                       scale, 1;
-                       description {
-                               state, "default" 0.0;
-                               min, 28 0;
-                               rel1.to, "part.bg";
-                               rel2 {
-                                       to, "part.bg";
-                                       relative, 0.0 1.0;
-                               }
-                               align, 0.0 0.5;
-                               fixed, 1 0;
-                       }
-               }
-
-               part {
-                       name, "padding.thumb.text.right";
+                       name, "padding.check.icon";
                        type, SPACER;
                        scale, 1;
                        description {
                                state, "default" 0.0;
-                               min, 28 0;
+                               min, 20 0;
                                rel1 {
                                        to, "part.bg";
                                        relative, 1.0 0.0;
@@ -130,106 +113,106 @@ group {
                }
 
                part {
-                       name, PART_COUNTRY_NAME;
-                       type, TEXT;
+                       name, "part.check.icon";
+                       type, IMAGE;
                        scale, 1;
                        description {
                                state, "default" 0.0;
-                               color, 51 51 51 255;
+                               min, 50 50;
                                rel1 {
-                                       to, "padding.thumb.text.left";
-                                       relative, 1.0 0.0;
+                                       to, "padding.check.icon";
+                                       relative, 0.0 0.5;
                                }
                                rel2 {
-                                       to, "padding.thumb.text.right";
-                                       relative, 0.0 1.0;
-                               }
-                               text {
-                                       font, FONT_LIGHT;
-                                       size, 28;
-                                       align, 0.0 0.5;
-                               }
-                               map {
-                                       perspective_on, 1;
-                                       perspective, "map";
+                                       to, "padding.check.icon";
+                                       relative, 0.0 0.5;
                                }
+                               align, 1.0 0.5;
+                               fixed, 1 1;
+                               image.normal, IC_CHECK_NOR_PNG;
+                               visible, 0;
                        }
                        description {
-                               state, "focused" 0.0;
+                               state, "focused.checked" 0.0;
                                inherit, "default" 0.0;
-                               color, 255 255 255 255;
+                               visible, 1;
                                map.on, 1;
+                               image.normal, IC_CHECK_FOC_PNG;
                        }
                        description {
-                               state, "unfocused" 0.0;
+                               state, "focused.unchecked" 0.0;
                                inherit, "default" 0.0;
                                map.on, 1;
                        }
                        description {
-                               state, "selected" 0.0;
-                               inherit, "focused" 0.0;
+                               state, "unfocused.checked" 0.0;
+                               inherit, "default" 0.0;
+                               visible, 1;
+                               map.on, 1;
+                       }
+                       description {
+                               state, "unfocused.unchecked" 0.0;
+                               inherit, "default" 0.0;
+                               map.on, 1;
                        }
                }
 
                part {
-                       name, "padding.check.icon";
+                       name, "padding.thumb.text.left";
                        type, SPACER;
                        scale, 1;
                        description {
                                state, "default" 0.0;
                                min, 20 0;
-                               rel1 {
+                               rel1.to, "part.bg";
+                               rel2 {
                                        to, "part.bg";
-                                       relative, 1.0 0.0;
+                                       relative, 0.0 1.0;
                                }
-                               rel2.to, "part.bg";
-                               align, 1.0 0.5;
+                               align, 0.0 0.5;
                                fixed, 1 0;
                        }
                }
 
                part {
-                       name, "part.check.icon";
-                       type, IMAGE;
+                       name, PART_COUNTRY_NAME;
+                       type, TEXT;
                        scale, 1;
                        description {
                                state, "default" 0.0;
-                               min, 50 50;
+                               color, 51 51 51 255;
                                rel1 {
-                                       to, "padding.check.icon";
-                                       relative, 0.0 0.5;
+                                       to, "padding.thumb.text.left";
+                                       relative, 1.0 0.0;
                                }
                                rel2 {
-                                       to, "padding.check.icon";
-                                       relative, 0.0 0.5;
+                                       to, "part.check.icon";
+                                       relative, 0.0 1.0;
+                               }
+                               text {
+                                       font, FONT_LIGHT;
+                                       size, 28;
+                                       align, 0.0 0.5;
+                               }
+                               map {
+                                       perspective_on, 1;
+                                       perspective, "map";
                                }
-                               align, 1.0 0.5;
-                               fixed, 1 1;
-                               image.normal, IC_CHECK_NOR_PNG;
-                               visible, 0;
-                       }
-                       description {
-                               state, "focused.checked" 0.0;
-                               inherit, "default" 0.0;
-                               visible, 1;
-                               map.on, 1;
-                               image.normal, IC_CHECK_FOC_PNG;
                        }
                        description {
-                               state, "focused.unchecked" 0.0;
+                               state, "focused" 0.0;
                                inherit, "default" 0.0;
+                               color, 255 255 255 255;
                                map.on, 1;
                        }
                        description {
-                               state, "unfocused.checked" 0.0;
+                               state, "unfocused" 0.0;
                                inherit, "default" 0.0;
-                               visible, 1;
                                map.on, 1;
                        }
                        description {
-                               state, "unfocused.unchecked" 0.0;
-                               inherit, "default" 0.0;
-                               map.on, 1;
+                               state, "selected" 0.0;
+                               inherit, "focused" 0.0;
                        }
                }
 
index 1e22fa5..b7c7058 100644 (file)
@@ -41,7 +41,7 @@ Eina_List* gridmgr_get_list(struct gridmgr *gmgr)
 
 struct gridmgr *gridmgr_create(void)
 {
-       struct gridmgr *gmgr;
+       struct gridmgr *gmgr = NULL;
 
        gmgr = calloc(1, sizeof(*gmgr));
        if (!gmgr) {
@@ -54,7 +54,7 @@ struct gridmgr *gridmgr_create(void)
 
 bool gridmgr_destroy(struct gridmgr *gmgr)
 {
-       struct grid_item *gitem;
+       struct grid_item *gitem = NULL;
 
        if (!gmgr) {
                _ERR("Invalid argument.");
@@ -75,7 +75,7 @@ bool gridmgr_destroy(struct gridmgr *gmgr)
 
 static Elm_Gengrid_Item_Class *_get_grid_item_class(struct grid_class *gclass)
 {
-       Elm_Gengrid_Item_Class *ic;
+       Elm_Gengrid_Item_Class *ic = NULL;
 
        if (!gclass) {
                _ERR("Invalid argument.");
@@ -126,8 +126,8 @@ static struct grid_item *_get_grid_item(struct gridmgr *gmgr, const char *id)
 bool gridmgr_add_grid(struct gridmgr *gmgr, const char *grid_id,
                Evas_Object *grid, struct grid_class *gclass)
 {
-       struct grid_item *gitem;
-       Elm_Gengrid_Item_Class *ic;
+       struct grid_item *gitem = NULL;
+       Elm_Gengrid_Item_Class *ic = NULL;
 
        if (!gmgr || !gclass || !grid_id || !grid) {
                _ERR("Invalid argument.");
@@ -185,13 +185,13 @@ bool gridmgr_remove_grid(struct gridmgr *gmgr, const char *grid_id)
        return true;
 }
 
-bool gridmgr_append_list(struct gridmgr *gmgr, const char *grid_id,
-               Eina_List *item_list)
+bool gridmgr_replace_list(struct gridmgr *gmgr, const char *grid_id,
+               Eina_List *item_list, void *item_data_to_find, Elm_Object_Item **item_found)
 {
        Eina_List *l = NULL;
-       Elm_Object_Item *it;
-       struct grid_item *gitem;
-       void *data;
+       Elm_Object_Item *it = NULL;
+       struct grid_item *gitem = NULL;
+       void *data = NULL;
 
        if (!gmgr || !grid_id || !item_list) {
                _ERR("Invalid argument.");
@@ -212,8 +212,10 @@ bool gridmgr_append_list(struct gridmgr *gmgr, const char *grid_id,
        EINA_LIST_FOREACH(item_list, l, data) {
                it = elm_gengrid_item_append(gitem->obj, gitem->ic, data,
                                NULL, NULL);
-
                elm_object_item_data_set(it, data);
+               if (item_found && data == item_data_to_find) {
+                       *item_found = it;
+               }
        }
 
        return true;
@@ -223,9 +225,9 @@ bool gridmgr_prepend_list(struct gridmgr *gmgr, const char *grid_id,
                Eina_List *item_list)
 {
        Eina_List *l = NULL;
-       Elm_Object_Item *it;
-       struct grid_item *gitem;
-       void *data;
+       Elm_Object_Item *it = NULL;
+       struct grid_item *gitem = NULL;
+       void *data = NULL;
 
        if (!gmgr || !grid_id || !item_list) {
                _ERR("Invalid argument.");
@@ -256,8 +258,8 @@ bool gridmgr_prepend_list(struct gridmgr *gmgr, const char *grid_id,
 bool gridmgr_append_item(struct gridmgr *gmgr, const char *grid_id,
                void *item)
 {
-       Elm_Object_Item *it;
-       struct grid_item *gitem;
+       Elm_Object_Item *it = NULL;
+       struct grid_item *gitem = NULL;
 
        if (!gmgr || !grid_id || !item) {
                _ERR("Invalid argument.");
@@ -283,8 +285,8 @@ bool gridmgr_append_item(struct gridmgr *gmgr, const char *grid_id,
 bool gridmgr_prepend_item(struct gridmgr *gmgr, const char *grid_id,
                void *item)
 {
-       Elm_Object_Item *it;
-       struct grid_item *gitem;
+       Elm_Object_Item *it = NULL;
+       struct grid_item *gitem = NULL;
 
        if (!gmgr || !grid_id || !item) {
                _ERR("Invalid argument.");
@@ -310,7 +312,7 @@ bool gridmgr_prepend_item(struct gridmgr *gmgr, const char *grid_id,
 Elm_Gengrid_Item_Class *gridmgr_get_item_class(struct gridmgr *gmgr,
                const char *grid_id)
 {
-       struct grid_item *gitem;
+       struct grid_item *gitem = NULL;
 
        if (!gmgr || !grid_id) {
                _ERR("Invalid argument.");
index dfbad75..f676bff 100644 (file)
@@ -39,7 +39,7 @@ struct list_info {
 
 struct listmgr *listmgr_create(Evas_Object *parent)
 {
-       struct listmgr *listmgr;
+       struct listmgr *listmgr = NULL;
 
        if (!parent) {
                _ERR("Invalid argument.");
@@ -59,7 +59,7 @@ struct listmgr *listmgr_create(Evas_Object *parent)
 
 bool listmgr_destroy(struct listmgr *listmgr)
 {
-       struct list_info *linfo;
+       struct list_info *linfo = NULL;
 
        if (!listmgr) {
                _ERR("Invalid argument.");
@@ -81,8 +81,8 @@ bool listmgr_destroy(struct listmgr *listmgr)
 static struct list_info *_get_list_info(struct listmgr *listmgr,
                const char *list_id)
 {
-       Eina_List *l;
-       struct list_info *linfo;
+       Eina_List *l = NULL;
+       struct list_info *linfo = NULL;
 
        EINA_LIST_FOREACH(listmgr->list, l, linfo) {
                if (!linfo)
@@ -98,7 +98,7 @@ static struct list_info *_get_list_info(struct listmgr *listmgr,
 static void _grid_mouse_move_cb(int id, void *data, Evas *e, Evas_Object *obj,
                Evas_Event_Mouse_Move *ev)
 {
-       Elm_Object_Item *it;
+       Elm_Object_Item *it = NULL;
 
        if (!obj || !ev) {
                _ERR("Invalid argument.");
@@ -118,7 +118,7 @@ static void _grid_mouse_move_cb(int id, void *data, Evas *e, Evas_Object *obj,
 static void _grid_item_selected_cb(void *data, Elm_Object_Item *it,
                const char *emission, const char *source)
 {
-       struct list_info *linfo;
+       struct list_info *linfo = NULL;
 
        if (!data || !it) {
                _ERR("Invalid argument.");
@@ -166,8 +166,8 @@ static input_handler _grid_input_handler = {
 static bool _add_grid(struct list_info *linfo, Evas_Object *parent,
                struct grid_class *gclass)
 {
-       struct gridmgr *gmgr;
-       Evas_Object *grid;
+       struct gridmgr *gmgr = NULL;
+       Evas_Object *grid = NULL;
 
        gmgr = gridmgr_create();
        if (!gmgr) {
@@ -201,7 +201,7 @@ static bool _add_grid(struct list_info *linfo, Evas_Object *parent,
 void listmgr_add_inner_grid_cb(struct listmgr *listmgr, const char *list_id,
                input_handler *handler, void *data)
 {
-       struct list_info *linfo;
+       struct list_info *linfo = NULL;
 
        if (!listmgr || !list_id || !handler) {
                _ERR("Invalid argument.");
@@ -222,7 +222,7 @@ void listmgr_add_inner_grid_cb(struct listmgr *listmgr, const char *list_id,
 void listmgr_remove_inner_grid_cb(struct listmgr *listmgr, const char *list_id,
                input_handler *handler)
 {
-       struct list_info *linfo;
+       struct list_info *linfo = NULL;
 
        if (!listmgr || !list_id || !handler) {
                _ERR("Invalid argument.");
@@ -245,7 +245,7 @@ bool listmgr_add_list(struct listmgr *listmgr, const char *list_id,
                void (*selected_cb)(Elm_Object_Item *it, void *data),
                void *cb_data)
 {
-       struct list_info *linfo;
+       struct list_info *linfo = NULL;
 
        if (!listmgr || !list_id || !gclass) {
                _ERR("Invalid argument.");
@@ -265,12 +265,8 @@ bool listmgr_add_list(struct listmgr *listmgr, const char *list_id,
        }
 
        linfo->list_id = strdup(list_id);
-
-       if (selected_cb)
-               linfo->selected_cb = selected_cb;
-
-       if (cb_data)
-               linfo->cb_data = cb_data;
+       linfo->selected_cb = selected_cb;
+       linfo->cb_data = cb_data;
 
        if (!_add_grid(linfo, listmgr->parent, gclass)) {
                _ERR("Add grid failed.");
@@ -286,7 +282,7 @@ bool listmgr_add_list(struct listmgr *listmgr, const char *list_id,
 
 bool listmgr_remove_list(struct listmgr *listmgr, const char *list_id)
 {
-       struct list_info *linfo;
+       struct list_info *linfo = NULL;
 
        if (!listmgr || !list_id) {
                _ERR("Invalid argument.");
@@ -308,12 +304,12 @@ bool listmgr_remove_list(struct listmgr *listmgr, const char *list_id)
        return true;
 }
 
-bool listmgr_show_list(struct listmgr *listmgr, const char *list_id,
-               const char *part, Eina_List *list)
+bool listmgr_fill_grid(struct listmgr *listmgr, const char *list_id,
+               Eina_List *list, void *get_item, Elm_Object_Item **item_returned)
 {
-       struct list_info *linfo;
+       struct list_info *linfo = NULL;
 
-       if (!listmgr || !list_id || !part || !list) {
+       if (!listmgr || !list_id || !list) {
                _ERR("Invalid argument.");
                return false;
        }
@@ -324,22 +320,45 @@ bool listmgr_show_list(struct listmgr *listmgr, const char *list_id,
                return false;
        }
 
-       if (!gridmgr_append_list(linfo->gmgr, list_id, list)) {
-               _ERR("Gridmgr append list failed.");
+       if (!gridmgr_replace_list(linfo->gmgr, list_id, list, get_item, item_returned)) {
+               _ERR("Gridmgr replace list failed.");
+               return false;
+       }
+
+       return true;
+}
+
+bool listmgr_show_grid(struct listmgr *listmgr, const char *list_id,
+               const char *part, Elm_Object_Item *selected_item)
+{
+       struct list_info *linfo = NULL;
+
+       if (!listmgr || !list_id || !part) {
+               _ERR("Invalid argument.");
+               return false;
+       }
+
+       linfo = _get_list_info(listmgr, list_id);
+       if (!linfo) {
+               _ERR("List %s does not exist.", list_id);
                return false;
        }
 
        elm_object_part_content_set(listmgr->parent, part, linfo->grid);
        evas_object_show(linfo->grid);
+       if (selected_item) {
+               elm_gengrid_item_selected_set(selected_item, EINA_TRUE);
+               elm_gengrid_item_show(selected_item, ELM_GENGRID_ITEM_SCROLLTO_MIDDLE);
+       }
 
        return true;
 }
 
-bool listmgr_update_list(struct listmgr *listmgr, const char *list_id)
+bool listmgr_update_grid(struct listmgr *listmgr, const char *list_id)
 {
-       struct list_info *linfo;
-       Eina_List *list, *l;
-       Elm_Object_Item *it;
+       struct list_info *linfo = NULL;
+       Eina_List *list, *l = NULL;
+       Elm_Object_Item *it = NULL;
 
        if (!listmgr || !list_id) {
                _ERR("Invalid argument.");
@@ -363,11 +382,6 @@ bool listmgr_update_list(struct listmgr *listmgr, const char *list_id)
                        continue;
 
                elm_gengrid_item_update(it);
-               /* Removed as it registers callback multiple times */
-               /*
-               elm_object_item_signal_callback_add(it, SIG_ITEM_SELECTED,
-                               SRC_EDC, _grid_item_selected_cb, linfo);
-               */
        }
 
        return true;
@@ -389,13 +403,16 @@ void listmgr_set_list_next_focus(struct listmgr *listmgr, const char *list_id,
                return;
        }
 
+       if (!obj_to_focus)
+               obj_to_focus = linfo->grid;
+
        elm_object_focus_next_object_set(linfo->grid, obj_to_focus, dir);
 }
 
-bool listmgr_hide_list(struct listmgr *listmgr, const char *list_id,
+bool listmgr_hide_grid(struct listmgr *listmgr, const char *list_id,
                const char *part)
 {
-       struct list_info *linfo;
+       struct list_info *linfo = NULL;
 
        if (!listmgr || !list_id || !part) {
                _ERR("Invalid argument.");
index 24dae40..c958098 100644 (file)
 #include "common/utils.h"
 #include "define.h"
 
+
+long int _timens() {
+    struct timespec start;
+    clock_gettime( CLOCK_REALTIME, &start);
+    return start.tv_nsec;
+}
+
 Evas_Object *utils_add_layout(Evas_Object *parent, const char *group,
                Eina_Bool win_resize)
 {
index bb2ae99..ae672ce 100644 (file)
@@ -34,11 +34,11 @@ struct _view_item {
        view_class *view_class;
 };
 
-static struct viewmgr *vmgr;
+static struct viewmgr *vmgr = NULL;
 
 static struct _view_item *_viewmgr_get_view_class(const char *view_id)
 {
-       struct _view_item *view;
+       struct _view_item *view = NULL;
 
        if (!vmgr) {
                _ERR("View manager didn't initialized.");
@@ -55,7 +55,7 @@ static struct _view_item *_viewmgr_get_view_class(const char *view_id)
 
 static void _viewmgr_list_free_cb(void *data)
 {
-       struct _view_item *view;
+       struct _view_item *view = NULL;
 
        if (data) {
                view = data;
@@ -100,8 +100,8 @@ bool viewmgr_destroy(void)
 
 bool viewmgr_add_view(view_class *view_class, void *data)
 {
-       Evas_Object *base;
-       struct _view_item *view;
+       Evas_Object *base = NULL;
+       struct _view_item *view = NULL;
 
        if (!vmgr) {
                _ERR("View manager didn't initialized.");
@@ -145,7 +145,7 @@ bool viewmgr_add_view(view_class *view_class, void *data)
 
 bool viewmgr_remove_view(const char *view_id)
 {
-       struct _view_item *view;
+       struct _view_item *view = NULL;
 
        if (!vmgr) {
                _ERR("View manager didn't initialized.");
@@ -166,8 +166,8 @@ bool viewmgr_remove_view(const char *view_id)
 
 bool viewmgr_show_view(const char *view_id)
 {
-       struct _view_item *view;
-       Eina_List *el;
+       struct _view_item *view = NULL;
+       Eina_List *el = NULL;
 
        if (!vmgr) {
                _ERR("View manager didn't initialized.");
@@ -194,7 +194,7 @@ bool viewmgr_show_view(const char *view_id)
 
 bool viewmgr_hide_view(const char *view_id)
 {
-       struct _view_item *view;
+       struct _view_item *view = NULL;
 
        if (!vmgr) {
                _ERR("View manager didn't initialized.");
@@ -217,7 +217,7 @@ bool viewmgr_hide_view(const char *view_id)
 
 bool viewmgr_update_view(const char *view_id, int update_type, void *data)
 {
-       struct _view_item *view;
+       struct _view_item *view = NULL;
 
        if (!vmgr) {
                _ERR("View manager didn't initialized.");
@@ -238,8 +238,9 @@ bool viewmgr_update_view(const char *view_id, int update_type, void *data)
 
 bool viewmgr_push_view(const char *view_id)
 {
-       struct _view_item *view, *v;
-       Eina_List *el;
+       struct _view_item *view = NULL;
+       struct _view_item *v = NULL;
+       Eina_List *el = NULL;
 
        if (!vmgr) {
                _ERR("View manager didn't initialized.");
@@ -276,7 +277,7 @@ bool viewmgr_push_view(const char *view_id)
 
 bool viewmgr_pop_view(void)
 {
-       struct _view_item *top;
+       struct _view_item *top = NULL;
 
        if (!vmgr) {
                _ERR("View manager didn't initialized.");
@@ -305,8 +306,8 @@ bool viewmgr_pop_view(void)
 
 bool viewmgr_pause(void)
 {
-       struct _view_item *view;
-       Eina_List *l;
+       struct _view_item *view = NULL;
+       Eina_List *l = NULL;
 
        if (!vmgr) {
                _ERR("View manager didn't initialized.");
@@ -326,8 +327,8 @@ bool viewmgr_pause(void)
 
 bool viewmgr_resume(void)
 {
-       struct _view_item *view;
-       Eina_List *l;
+       struct _view_item *view = NULL;
+       Eina_List *l = NULL;
 
        if (!vmgr) {
                _ERR("View manager didn't initialized.");
@@ -347,7 +348,7 @@ bool viewmgr_resume(void)
 
 view_state viewmgr_get_view_state(const char *view_id)
 {
-       struct _view_item *view;
+       struct _view_item *view = NULL;
 
        if (!vmgr) {
                _ERR("View manager didn't initialized.");
@@ -363,7 +364,7 @@ view_state viewmgr_get_view_state(const char *view_id)
 
 bool viewmgr_set_view_data(const char *view_id, void *view_data)
 {
-       struct _view_item *view;
+       struct _view_item *view = NULL;
 
        if (!vmgr) {
                _ERR("View manager didn't initialized.");
index 7f124c6..c03a1f3 100644 (file)
  */
 
 #include <Elementary.h>
+#include <system_settings.h>
+#include <utils_i18n.h>
 
 #include "app_debug.h"
 #include "common/datamgr.h"
+#include "common/inputmgr.h"
 #include "data/system/data_location.h"
 
+#define DEFAULT_COUNTRY "US"
+#define MAX_COUNTRY_NAME_LENGTH 250
+
 struct _priv {
        Eina_List *list;
        void (*event_cb)(enum event_type type, void *data);
@@ -76,19 +82,8 @@ static bool _destroy(void *dclass_data)
        return true;
 }
 
-static bool _update(void *dclass_data)
-{
-       if (!dclass_data) {
-               _ERR("Invalid argument.");
-               return false;
-       }
-
-       return true;
-}
-
 static bool _select(void *dclass_data, Elm_Object_Item *it, void *data)
 {
-       //      struct country_info_s *country_info = NULL;
        struct _priv *priv = dclass_data;
 
        if (!priv || !it) {
@@ -96,17 +91,6 @@ static bool _select(void *dclass_data, Elm_Object_Item *it, void *data)
                return false;
        }
 
-//     if (it) {
-//             country_info = (struct country_info_s*)elm_object_item_data_get(it);
-//                     TODO: Current description of SYSTEM_SETTINGS_KEY_LOCALE_COUNTRY key is wrong, so we wait for correction
-//                     to implement correct setting.
-//                     if (system_settings_set_value_string(SYSTEM_SETTINGS_KEY_LOCALE_COUNTRY, country_info->country_code)
-//                                     != SYSTEM_SETTINGS_ERROR_NONE) {
-//                             _ERR("Cannot set country settings value!");
-//                             return;
-//                     }
-//     }
-
        if (priv->event_cb)
                priv->event_cb(EVENT_DATA_SELECT_DONE, priv->cb_data);
 
@@ -128,7 +112,6 @@ static Eina_List *_get_data(void *dclass_data)
 static struct data_class _dclass = {
        .create = _create,
        .destroy = _destroy,
-       .update = _update,
        .select = _select,
        .get_data = _get_data,
 };
@@ -137,3 +120,98 @@ struct data_class *get_location_data_class(void)
 {
        return &_dclass;
 }
+
+void data_location_set_new_system_location(Elm_Object_Item *selected_item)
+{
+       struct country_info_s *country_info = NULL;
+       // TODO: Current description of SYSTEM_SETTINGS_KEY_LOCALE_COUNTRY key is wrong, so we wait for correction
+       // to implement correct setting.
+       char fake_code[6] = {'e', 'n', '_','?','?','\0'};
+
+       if (!selected_item)
+               return;
+
+       country_info = (struct country_info_s*)elm_object_item_data_get(selected_item);
+       fake_code[3] = country_info->country_code[0];
+       fake_code[4] = country_info->country_code[1];
+       if (system_settings_set_value_string(SYSTEM_SETTINGS_KEY_LOCALE_COUNTRY, fake_code)
+                       != SYSTEM_SETTINGS_ERROR_NONE)
+               _ERR("Cannot set country settings value!");
+}
+
+
+static char *_get_current_country()
+{
+       char *current_country = NULL;
+       char *country_2letter = NULL;
+//     TODO: currently country key is bugged, correct when fixed
+       if (system_settings_get_value_string(SYSTEM_SETTINGS_KEY_LOCALE_COUNTRY, &current_country)
+                       != SYSTEM_SETTINGS_ERROR_NONE) {
+               _ERR("Cannot get current country setting!");
+       } else {
+               _DBG("Current country: %s", current_country);
+       }
+       if (current_country) {
+               country_2letter = strdup(&current_country[strlen(current_country) - 2]);
+               free(current_country);
+       } else {
+               country_2letter=strdup(DEFAULT_COUNTRY);
+       }
+       return country_2letter;
+}
+
+void data_location_fill_list_data(struct listmgr *list_mgr, Elm_Object_Item **get_country, const char *lang)
+{
+       Eina_List *list = NULL;
+       struct country_info_s *country_info = NULL;
+       struct country_info_s *select_first = NULL;
+       char *current_country = NULL;
+       const char * const *code_tab;
+       i18n_uchar country_uchr[MAX_COUNTRY_NAME_LENGTH + 2] = {0,};
+       char country[MAX_COUNTRY_NAME_LENGTH + 1];
+       char fake_code[4] = {'_','?','?','\0'};
+
+       code_tab = i18n_ulocale_get_iso_countries();
+       if (get_last_result() != I18N_ERROR_NONE) {
+               _ERR("Cannot get ISO country codes list");
+               return;
+       }
+       current_country = _get_current_country();
+
+       while (*code_tab) {
+               fake_code[1] = (*code_tab)[0];
+               fake_code[2] = (*code_tab)[1];
+               i18n_ulocale_get_display_country(fake_code, lang, country_uchr, MAX_COUNTRY_NAME_LENGTH);
+               if (get_last_result() != I18N_ERROR_NONE) {
+                       _ERR("Cannot get display country for code %s", fake_code);
+                       ++code_tab;
+                       continue;
+               }
+               i18n_ustring_copy_au_n(country, country_uchr, MAX_COUNTRY_NAME_LENGTH);
+               if (get_last_result() != I18N_ERROR_NONE) {
+                       _ERR("Cannot convert ustring to c_string");
+                       ++code_tab;
+                       continue;
+               }
+
+               country_info = calloc(1, sizeof(*country_info));
+               if (!country_info) {
+                       _ERR("Cannot allocate memory");
+                       break;
+               }
+               country_info->country_code = *code_tab;
+               country_info->long_name = strdup(country);
+               if (current_country && (*code_tab)[0] == current_country[0] && (*code_tab)[1] == current_country[1]) {
+                       select_first = country_info;
+               }
+               list = eina_list_append(list, country_info);
+               ++code_tab;
+       }
+       free(current_country);
+
+       if (!listmgr_fill_grid(list_mgr, LOCATION_LIST_ID, list, select_first, get_country)) {
+               _ERR("Fill location list failed.");
+       }
+       listmgr_set_list_next_focus(list_mgr, LOCATION_LIST_ID,
+                       NULL, ELM_FOCUS_UP);
+}
index 2e9efd4..3b6f9b3 100644 (file)
@@ -130,7 +130,7 @@ static void _network_type_option_selected(struct _priv *priv, int id,
 
                /* Hide wireless network list */
                elm_object_signal_emit(priv->ly, SIG_WIRELESS_EXISTS, SRC_ELM);
-               listmgr_hide_list(priv->listmgr, LIST_WIRELESS,
+               listmgr_hide_grid(priv->listmgr, LIST_WIRELESS,
                                PART_WIRELESS_LIST);
                elm_object_signal_emit(priv->ly, SIG_LOADING_STOP, SRC_ELM);
 
@@ -148,7 +148,7 @@ static void _network_type_option_selected(struct _priv *priv, int id,
 
                /* Hide wireless network list */
                elm_object_signal_emit(priv->ly, SIG_WIRELESS_EXISTS, SRC_ELM);
-               listmgr_hide_list(priv->listmgr, LIST_WIRELESS,
+               listmgr_hide_grid(priv->listmgr, LIST_WIRELESS,
                                PART_WIRELESS_LIST);
                elm_object_signal_emit(priv->ly, SIG_LOADING_STOP, SRC_ELM);
                elm_object_part_text_set(priv->ly, PART_NO_NETWORK_TEXT, "");
@@ -341,7 +341,7 @@ static void _retry_wireless_network(struct _priv *priv)
                elm_object_signal_emit(priv->ly, SIG_NO_WIRELESS, SRC_ELM);
                elm_object_signal_emit(priv->ly, SIG_LOADING_STOP, SRC_ELM);
                elm_object_part_text_set(priv->ly, PART_NO_NETWORK_TEXT, STR_NO_NETWORK);
-               listmgr_hide_list(priv->listmgr, LIST_WIRELESS,
+               listmgr_hide_grid(priv->listmgr, LIST_WIRELESS,
                        PART_WIRELESS_LIST);
                return;
        }
@@ -363,7 +363,7 @@ static void _retry_wireless_network(struct _priv *priv)
                elm_object_signal_emit(priv->ly, SIG_NO_WIRELESS, SRC_ELM);
                elm_object_signal_emit(priv->ly, SIG_LOADING_STOP, SRC_ELM);
                elm_object_part_text_set(priv->ly, PART_NO_NETWORK_TEXT, STR_NO_NETWORK);
-               listmgr_hide_list(priv->listmgr, LIST_WIRELESS,
+               listmgr_hide_grid(priv->listmgr, LIST_WIRELESS,
                        PART_WIRELESS_LIST);
        } else {
                elm_object_signal_emit(priv->ly, SIG_LOADING_START, SRC_ELM);
@@ -466,8 +466,8 @@ static void _draw_no_contents_message(struct _priv *priv)
 
 static void _wireless_data_found_done(struct _priv *priv, Eina_List *list)
 {
-       if (!listmgr_show_list(priv->listmgr, LIST_WIRELESS,
-                               PART_WIRELESS_LIST, list)) {
+       if (!listmgr_fill_grid(priv->listmgr, LIST_WIRELESS, list, NULL, NULL)
+                       || !listmgr_show_grid(priv->listmgr, LIST_WIRELESS, PART_WIRELESS_LIST, NULL)) {
                _ERR("Listmgr show list failed.");
                _draw_no_contents_message(priv);
                return;
@@ -560,7 +560,7 @@ static void _data_event_cb(enum event_type type, void *data)
                elm_object_signal_emit(priv->ly, SIG_NO_WIRELESS, SRC_ELM);
                elm_object_signal_emit(priv->ly, SIG_LOADING_STOP, SRC_ELM);
                elm_object_part_text_set(priv->ly, PART_NO_NETWORK_TEXT, STR_NO_NETWORK);
-               listmgr_hide_list(priv->listmgr, LIST_WIRELESS,
+               listmgr_hide_grid(priv->listmgr, LIST_WIRELESS,
                        PART_WIRELESS_LIST);
        break;
        case EVENT_DATA_UPDATE_DONE:
@@ -584,7 +584,7 @@ static void _data_event_cb(enum event_type type, void *data)
                elm_object_item_signal_emit(priv->selected_wireless_item,
                                SIG_LOADING_STOP, SRC_ELM);
 
-               if (!listmgr_update_list(priv->listmgr, LIST_WIRELESS))
+               if (!listmgr_update_grid(priv->listmgr, LIST_WIRELESS))
                        _ERR("Listmgr update list failed.");
 
                break;
@@ -599,7 +599,7 @@ static void _data_event_cb(enum event_type type, void *data)
                /* Update connection state for all items.
                 * When profile is switched to ethernet,
                 * 'Connected' check icon still remains.. */
-               if (!listmgr_update_list(priv->listmgr, LIST_WIRELESS))
+               if (!listmgr_update_grid(priv->listmgr, LIST_WIRELESS))
                        _ERR("Listmgr update list failed.");
                break;
 
index 63bafa7..45704cd 100644 (file)
@@ -297,8 +297,8 @@ static bool _select_item(Elm_Object_Item *it, struct _priv *priv,
                        item_info->enabled = false;
                }
 
-               if (!listmgr_update_list(priv->list_mgr, list_id))
-                       _ERR("Listmgr update list failed.");
+               if (!listmgr_update_grid(priv->list_mgr, list_id))
+                       _ERR("Listmgr update grid failed.");
        }
 
        return true;
@@ -369,8 +369,10 @@ static bool _fill_lists(struct _priv *priv)
                priv->sound_modes_list = eina_list_append(priv->sound_modes_list, item_info);
        }
 
-       if (!listmgr_show_list(priv->list_mgr, LIST_SOUND_MODES_ID,
-                               PART_SOUND_MODE_CONTENT, priv->sound_modes_list)) {
+       if (!listmgr_fill_grid(priv->list_mgr, LIST_SOUND_MODES_ID,
+                       priv->sound_modes_list, NULL, NULL) ||
+                       !listmgr_show_grid(priv->list_mgr, LIST_SOUND_MODES_ID,
+                               PART_SOUND_MODE_CONTENT, priv->selected_sound_mode)) {
                _ERR("Listmgr show sound modes list failed.");
                _free_list(&priv->sound_modes_list);
                return false;
@@ -389,8 +391,10 @@ static bool _fill_lists(struct _priv *priv)
                priv->speakers_list = eina_list_append(priv->speakers_list, item_info);
        }
 
-       if (!listmgr_show_list(priv->list_mgr, LIST_SPEAKERS_ID,
-                               PART_SPEAKER_SETTINGS_CONTENT, priv->speakers_list)) {
+       if (!listmgr_fill_grid(priv->list_mgr, LIST_SPEAKERS_ID,
+                       priv->speakers_list, NULL, NULL) ||
+                       !listmgr_show_grid(priv->list_mgr, LIST_SPEAKERS_ID,
+                               PART_SPEAKER_SETTINGS_CONTENT, priv->selected_speaker)) {
                _ERR("Listmgr show speakers list failed.");
                _free_list(&priv->sound_modes_list);
                _free_list(&priv->speakers_list);
index ef25764..d613170 100644 (file)
@@ -67,7 +67,6 @@ static char *_get_location(void *data, int id);
 static void _selected(void *data, int id);
 static void _focused(void *data, int id);
 static void _selected_menu(void *data, int id);
-static void _location_selected(void *data, int id);
 
 static struct menumgr_info menu_info[] = {
        {
@@ -103,7 +102,7 @@ static struct menumgr_info menu_info[] = {
        },
        {
                .id = MENU_CHANGE_PINCODE,
-               .title = "Change Pincode",
+               .title = STR_CHANGE_PINCODE,
                .style = STYLE_NORMAL_BTN,
                .disabled = EINA_FALSE,
                .selected = _selected,
@@ -136,13 +135,13 @@ static struct menumgr_info menu_info[] = {
                .style = STYLE_STATUS_BTN,
                .disabled = EINA_FALSE,
                .status = _get_location,
-               .selected = _location_selected,
+               .selected = _selected,
                .focused = _focused,
                .selected_menu = _selected_menu
        },
        {
                .id = MENU_RESET,
-               .title = "Reset",
+               .title = STR_RESET,
                .style = STYLE_NORMAL_BTN,
                .disabled = EINA_FALSE,
                .selected = _selected,
@@ -243,6 +242,10 @@ static void _selected(void *data, int id)
                        if (!viewmgr_show_view(VIEW_SUBTITLE))
                                _ERR("Show Language view failed.");
                                break;
+               case MENU_LOCATION:
+                       if (!viewmgr_push_view(VIEW_LOCATION))
+                               _ERR("Show Location view failed.");
+                               break;
                case MENU_RESET:
                        if (!viewmgr_show_view(VIEW_RESET))
                                _ERR("Show reset view failed.");
@@ -288,26 +291,6 @@ static void _selected_menu(void *data, int id)
        viewmgr_show_view(VIEW_ACTION_MENU);
 }
 
-static void _location_selected(void *data, int id)
-{
-       SETTING_TRACE_BEGIN;
-
-       viewmgr_hide_view(VIEW_LOCATION);
-       viewmgr_remove_view(VIEW_LOCATION);
-
-       SETTING_TRACE("1 - location");
-       if (!viewmgr_add_view(view_location_get_vclass(), NULL))
-               _ERR("Add view failed.");
-
-       if (!viewmgr_push_view(VIEW_LOCATION))
-               _ERR("Push view failed.");
-
-       SETTING_TRACE("2 - location");
-
-       if (!viewmgr_show_view(VIEW_LOCATION))
-               _ERR("viewmgr_show_view failed.");
-}
-
 static bool _add_layout_contents(struct _priv *priv, Evas_Object *tab_button)
 {
        Evas_Object *table = NULL;
index b3384fe..ea979c4 100644 (file)
@@ -52,6 +52,8 @@ static void _destroy_system_ui(void);
 
 static bool _create(void *data)
 {
+       SETTING_TRACE_BEGIN;
+
        int w = 0;
        int h = 0;
        struct _appdata *ad;
@@ -234,6 +236,8 @@ static bool _create_picture_ui(void)
 
 static bool _create_system_ui(void)
 {
+       SETTING_TRACE_BEGIN;
+
        if (!viewmgr_add_view(view_clock_get_vclass(), NULL)) {
                _ERR("Adding clock view failed.");
                return false;
index a13bc87..661a6de 100644 (file)
@@ -245,10 +245,10 @@ static bool _add_clock_setting(clock_view_priv_data *priv)
 
 static Evas_Object *_create(Evas_Object *win, void *data)
 {
+       SETTING_TRACE_BEGIN;
        clock_view_priv_data *priv = NULL;
        Evas_Object *base = NULL;
 
-       _DBG("Called");
        if (!win) {
                _ERR("Get window object failed.");
                return NULL;
index 80a2590..93b12b2 100644 (file)
 
 #include <app.h>
 #include <Elementary.h>
-#include <system_settings.h>
-#include <utils_i18n.h>
 
-#include "common/viewmgr.h"
-#include "common/layoutmgr.h"
-#include "common/inputmgr.h"
 #include "app_debug.h"
-#include "app_string.h"
 #include "define.h"
 #include "layout.h"
 #include "layout/system.h"
+#include "common/datamgr.h"
+#include "common/inputmgr.h"
+#include "common/layoutmgr.h"
+#include "common/listmgr.h"
 #include "common/utils.h"
+#include "common/viewmgr.h"
 #include "view/view_base.h"
-#include "common/gridmgr.h"
-#include "common/listmgr.h"
-#include "common/datamgr.h"
 #include "grid/grid_location.h"
+#include "data/system/settings_language.h"
 #include "data/system/data_location.h"
 
-#define LOCATION_LIST_ID "LIST_LOCATION"
-
-static char *country_codes[] = {
-               "AF", "AX", "AL", "DZ", "AS", "AD", "AO", "AI", "AQ", "AG",
-               "AR", "AM", "AW", "AU", "AT", "AZ", "BS", "BH", "BD", "BB",
-               "BY", "BE", "BZ", "BJ", "BM", "BT", "BO", "BQ", "BA", "BW",
-               "BV", "BR", "IO", "BN", "BG", "BF", "BI", "CV", "KH", "CM",
-               "CA", "KY", "CF", "TD", "CL", "CN", "CX", "CC", "CO", "KM",
-               "CD", "CG", "CK", "CR", "CI", "HR", "CU", "CW", "CY", "CZ",
-               "DK", "DJ", "DM", "DO", "EC", "EG", "SV", "GQ", "ER", "EE",
-               "ET", "FK", "FO", "FJ", "FI", "FR", "GF", "PF", "TF", "GA",
-               "GM", "GE", "DE", "GH", "GI", "GR", "GL", "GD", "GP", "GU",
-               "GT", "GG", "GN", "GW", "GY", "HT", "HM", "VA", "HN", "HK",
-               "HU", "IS", "IN", "ID", "IR", "IQ", "IE", "IM", "IL", "IT",
-               "JM", "JP", "JE", "JO", "KZ", "KE", "KI", "KP", "KR", "KW",
-               "KG", "LA", "LV", "LB", "LS", "LR", "LY", "LI", "LT", "LU",
-               "MO", "MK", "MG", "MW", "MY", "MV", "ML", "MT", "MH", "MQ",
-               "MR", "MU", "YT", "MX", "FM", "MD", "MC", "MN", "ME", "MS",
-               "MA", "MZ", "MM", "NA", "NR", "NP", "NL", "NC", "NZ", "NI",
-               "NE", "NG", "NU", "NF", "MP", "NO", "OM", "PK", "PW", "PS",
-               "PA", "PG", "PY", "PE", "PH", "PN", "PL", "PT", "PR", "QA",
-               "RE", "RO", "RU", "RW", "BL", "SH", "KN", "LC", "MF", "PM",
-               "VC", "WS", "SM", "ST", "SA", "SN", "RS", "SC", "SL", "SG",
-               "SX", "SK", "SI", "SB", "SO", "ZA", "GS", "SS", "ES", "LK",
-               "SD", "SR", "SJ", "SZ", "SE", "CH", "SY", "TW", "TJ", "TZ",
-               "TH", "TL", "TG", "TK", "TO", "TT", "TN", "TR", "TM", "TC",
-               "TV", "UG", "UA", "AE", "GB", "UM", "US", "UY", "UZ", "VU",
-               "VE", "VN", "VG", "VI", "WF", "EH", "YE", "ZM", "ZW"};
-
-#define NUMBER_OF_COUNTRIES (sizeof(country_codes)/sizeof(country_codes[0]))
-
 struct _priv {
        Evas_Object *win;
        Evas_Object *base;
-       Evas_Object *menu[LAYOUT_MAX];
-       int cur_menu;
+       layoutmgr *ly_mgr;
        Evas_Object *_btn1;
        Evas_Object *_btn2;
 
        struct listmgr *list_mgr;
-       Eina_List *country_list;
        struct datamgr *country_data_mgr;
        Elm_Object_Item *selected_country_item;
-       Evas_Object *last_focused;
+       Elm_Object_Item *configured_country;
+       char *language;
 };
 
 enum object_type {
@@ -86,64 +51,17 @@ enum object_type {
        EO_BTN_LOCATION_OK
 };
 
-static void _fill_list_data(struct _priv *priv)
-{
-       Eina_List *list = NULL;
-       struct country_info_s *country_info = NULL;
-       int i;
-       char *country_msgid = NULL;
-
-       if (priv->country_list)
-               return;
-
-       country_msgid = strdup("IDS_COUNTRY_NAME_??");
-       for (i = 0; i < NUMBER_OF_COUNTRIES; ++i) {
-               country_info = calloc(1, sizeof(*country_info));
-               country_info->country_code = country_codes[i];
-               country_msgid[17] = country_codes[i][0];
-               country_msgid[18] = country_codes[i][1];
-               country_info->long_name = strdup(_(country_msgid));
-               list = eina_list_append(list, country_info);
-       }
-       free(country_msgid);
-
-       priv->country_list = list;
-}
-
-static void _grid_realized_cb(int id, void *data, Evas_Object *obj,
-               Elm_Object_Item *item)
-{
-       struct country_info_s *country_info = NULL;
-
-       if (!item) {
-               _ERR("Invalid argument.");
-               return;
-       }
-
-       country_info = (struct country_info_s*)elm_object_item_data_get(item);
-       _DBG("Realized: %s", country_info->long_name);
-}
-
-static input_handler _grid_input_handler = {
-       .realized = _grid_realized_cb,
+static void _btn_clicked_cb(int id, void *data, Evas_Object *obj);
+static void _btn_key_down_cb(int id, void *data, Evas *e, Evas_Object *obj, Evas_Event_Key_Down *ev);
+static input_handler _input_handler = {
+       .clicked = _btn_clicked_cb,
+       .key_down = _btn_key_down_cb
 };
 
-static void _show_country_list(struct _priv *priv)
-{
-       if (!priv->list_mgr || !priv->country_list) {
-               _ERR("Data not prepared to show list");
-               return;
-       }
-
-       if (!listmgr_show_list(priv->list_mgr, LOCATION_LIST_ID,
-                               PART_LOCATION_MENU, priv->country_list)) {
-               _ERR("Listmgr show list failed.");
-               return;
-       }
-}
-
 static void _data_event_cb(enum event_type type, void *data)
 {
+       SETTING_TRACE_BEGIN;
+
        struct _priv *priv = data;
 
        if (!priv) {
@@ -152,7 +70,7 @@ static void _data_event_cb(enum event_type type, void *data)
        }
 
        if (type == EVENT_DATA_SELECT_DONE) {
-               if (!listmgr_update_list(priv->list_mgr, LOCATION_LIST_ID))
+               if (!listmgr_update_grid(priv->list_mgr, LOCATION_LIST_ID))
                        _ERR("Listmgr update list failed.");
        } else {
                _ERR("Unhandled data event type.");
@@ -162,6 +80,8 @@ static void _data_event_cb(enum event_type type, void *data)
 
 static void _country_selected_cb(Elm_Object_Item *it, void *data)
 {
+       SETTING_TRACE_BEGIN;
+
        struct country_info_s *country_info = NULL;
        struct _priv *priv = data;
 
@@ -197,16 +117,38 @@ static void _country_selected_cb(Elm_Object_Item *it, void *data)
        }
 }
 
-static void _popup_clicked_cb(int id, void *data, Evas_Object *obj);
-static void _popup_key_down_cb(int id, void *data, Evas *e, Evas_Object *obj, Evas_Event_Key_Down *ev);
+static void _show_country_list(struct _priv *priv)
+{
+       SETTING_TRACE_BEGIN;
+       char *lang = NULL;
 
-static input_handler _input_handler = {
-       .clicked = _popup_clicked_cb,
-       .key_down = _popup_key_down_cb
-};
+       if (!priv->list_mgr) {
+               _ERR("Data not prepared to show list");
+               return;
+       }
+
+       lang = settings_language_get_language_locale_str();
+       if (!priv->language || strcmp(priv->language, lang)) {
+               free(priv->language);
+               priv->language = lang;
+               priv->selected_country_item = NULL;
+               data_location_fill_list_data(priv->list_mgr, &priv->configured_country, lang);
+       } else {
+               free(lang);
+       }
+
+       if (!listmgr_show_grid(priv->list_mgr, LOCATION_LIST_ID,
+                               PART_LOCATION_MENU, priv->configured_country)) {
+               _ERR("Listmgr show list failed.");
+               return;
+       }
+       _country_selected_cb(priv->configured_country, priv);
+}
 
-static void _popup_clicked_cb(int id, void *data, Evas_Object *obj)
+static void _btn_clicked_cb(int id, void *data, Evas_Object *obj)
 {
+       SETTING_TRACE_BEGIN;
+
        struct _priv *priv = data;
 
        if (!priv || !obj) {
@@ -216,7 +158,14 @@ static void _popup_clicked_cb(int id, void *data, Evas_Object *obj)
 
        switch (id) {
        case EO_BTN_LOCATION_CANCEL:
+               viewmgr_pop_view();
+               break;
+
        case EO_BTN_LOCATION_OK:
+               if (priv->selected_country_item != priv->configured_country) {
+                       data_location_set_new_system_location(priv->selected_country_item);
+                       priv->configured_country = priv->selected_country_item;
+               }
                viewmgr_pop_view();
                break;
 
@@ -226,9 +175,11 @@ static void _popup_clicked_cb(int id, void *data, Evas_Object *obj)
        }
 }
 
-static void _popup_key_down_cb(int id, void *data, Evas *e, Evas_Object *obj,
+static void _btn_key_down_cb(int id, void *data, Evas *e, Evas_Object *obj,
                Evas_Event_Key_Down *ev)
 {
+       SETTING_TRACE_BEGIN;
+
        struct _priv *priv = data;
 
        if (!ev || !priv) {
@@ -247,7 +198,6 @@ static bool _draw_menu_area(struct _priv *priv)
 
        Evas_Object *btn1 = NULL;
        Evas_Object *btn2 = NULL;
-//     char *current_country = NULL;
 
        if (!priv || !priv->base) {
                _ERR("Invalid argument.");
@@ -274,16 +224,6 @@ static bool _draw_menu_area(struct _priv *priv)
        inputmgr_add_callback(btn1, EO_BTN_LOCATION_CANCEL, &_input_handler, priv);
        inputmgr_add_callback(btn2, EO_BTN_LOCATION_OK, &_input_handler, priv);
 
-       _show_country_list(priv);
-
-//     TODO: automatically focus current location
-//     if (system_settings_get_value_string(SYSTEM_SETTINGS_KEY_LOCALE_COUNTRY, &current_country)
-//                     != SYSTEM_SETTINGS_ERROR_NONE) {
-//             _ERR("Cannot get current country setting!");
-//     } else {
-//             _DBG("Current country: %s", current_country);
-//     }
-
        return true;
 }
 
@@ -351,7 +291,6 @@ static Evas_Object *_create(Evas_Object *win, void *data)
 
        priv->win = win;
        priv->list_mgr = listmgr;
-       priv->cur_menu = LAYOUT_MAX;
        priv->country_data_mgr = dmgr;
 
        if (!viewmgr_set_view_data(VIEW_LOCATION, priv)) {
@@ -363,10 +302,8 @@ static Evas_Object *_create(Evas_Object *win, void *data)
                return NULL;
        }
 
-       listmgr_add_inner_grid_cb(priv->list_mgr, LOCATION_LIST_ID,
-                       &_grid_input_handler, NULL);
+       data_location_fill_list_data(listmgr, &priv->configured_country, NULL);
 
-       _fill_list_data(priv);
        _draw_menu_area(priv);
 
        return base;
@@ -383,11 +320,7 @@ static void _show(void *data)
        }
 
        evas_object_show(priv->base);
-       if (priv->last_focused) {
-               elm_object_focus_set(priv->last_focused, EINA_TRUE);
-       } else {
-               elm_object_focus_set(priv->_btn1, EINA_TRUE);
-       }
+       _show_country_list(priv);
 }
 
 static void _hide(void *data)
@@ -401,7 +334,9 @@ static void _hide(void *data)
                return;
        }
 
-       priv->last_focused = elm_object_focused_object_get(priv->base);
+       if (!listmgr_hide_grid(priv->list_mgr, LOCATION_LIST_ID, PART_LOCATION_MENU)) {
+               _ERR("Listmgr hide list failed.");
+       }
        evas_object_hide(priv->base);
 }
 
@@ -417,13 +352,12 @@ static void _destroy(void *data)
        }
 
        datamgr_destroy(priv->country_data_mgr);
-
-       listmgr_remove_inner_grid_cb(priv->list_mgr, LOCATION_LIST_ID,
-                       &_grid_input_handler);
        listmgr_destroy(priv->list_mgr);
 
+       layoutmgr_destroy(priv->ly_mgr);
        evas_object_del(priv->base);
 
+       free(priv->language);
        free(priv);
 }
 
index 48381c0..f22cf05 100644 (file)
@@ -112,6 +112,7 @@ view_class *view_pincode_get_vclass(void)
 
 static Evas_Object *_create(Evas_Object *win, void *data)
 {
+       SETTING_TRACE_BEGIN;
        pincode_view_data *priv = NULL;
 
        if (!win)
index 47e3d10..70e50b8 100644 (file)
@@ -410,6 +410,8 @@ static void _menu_focused_cb(int id, void *data, Evas_Object *obj,
 
 static Evas_Object *_create(Evas_Object *win, void *data)
 {
+       SETTING_TRACE_BEGIN;
+
        struct _priv *priv = NULL;
        int i = 0;