e intl settings: use icons for regions.

SVN revision: 73885

src/modules/conf_intl/e_int_config_intl.c

@@ -50,6 +50,7 @@ struct _E_Intl_Langauge_Node
 {
    const char *lang_code; /* en */
    const char *lang_name; /* English (trans in ilist) */
+   const char *lang_icon;
    int         lang_available; /* defined in e translation */
    Eina_Hash  *region_hash; /* US->utf8 */
 };
@@ -58,6 +59,7 @@ struct _E_Intl_Region_Node
 {
    const char *region_code; /* US */
    const char *region_name; /* United States */
+   const char *region_icon;
    Eina_List  *available_codesets;
    Eina_List  *available_modifiers;
 };
@@ -280,65 +282,65 @@ const E_Intl_Pair language_predefined_pairs[] = {
 };
 
 const E_Intl_Pair region_predefined_pairs[] = {
-   { "AF", NULL, "Afghanistan"},
+   { "AF", "af_flag.png", "Afghanistan"},
    { "AX", NULL, "Åland"},
-   { "AL", NULL, "Shqipëria"},
+   { "AL", "al_flag.png", "Shqipëria"},
    { "DZ", NULL, "Algeria"},
    { "AS", NULL, "Amerika Sāmoa"},
-   { "AD", NULL, "Andorra"},
+   { "AD", "ad_flag.png", "Andorra"},
    { "AO", NULL, "Angola"},
    { "AI", NULL, "Anguilla"},
    { "AQ", NULL, "Antarctica"},
    { "AG", NULL, "Antigua and Barbuda"},
-   { "AR", NULL, "Argentina"},
-   { "AM", NULL, "Հայաստան"},
+   { "AR", "ar_flag.png", "Argentina"},
+   { "AM", "am_flag.png", "Հայաստան"},
    { "AW", NULL, "Aruba"},
    { "AU", NULL, "Australia"},
-   { "AT", NULL, "Österreich"},
-   { "AZ", NULL, "Azərbaycan"},
+   { "AT", "at_flag.png", "Österreich"},
+   { "AZ", "az_flag.png", "Azərbaycan"},
    { "BS", NULL, "Bahamas"},
    { "BH", NULL, "Bahrain"},
-   { "BD", NULL, "বাংলাদেশ"},
+   { "BD", "bd_flag.png", "বাংলাদেশ"},
    { "BB", NULL, "Barbados"},
-   { "BY", NULL, "Беларусь"},
-   { "BE", NULL, "Belgium"},
+   { "BY", "bw_flag.png", "Беларусь"},
+   { "BE", "be_flag.png", "Belgium"},
    { "BZ", NULL, "Belize"},
    { "BJ", NULL, "Bénin"},
    { "BM", NULL, "Bermuda"},
-   { "BT", NULL, "Bhutan"},
+   { "BT", "bt_flag.png", "Bhutan"},
    { "BO", NULL, "Bolivia"},
-   { "BA", NULL, "Bosnia and Herzegovina"},
-   { "BW", NULL, "Botswana"},
+   { "BA", "ba_flag.png", "Bosnia and Herzegovina"},
+   { "BW", "bw_flag.png", "Botswana"},
    { "BV", NULL, "Bouvetøya"},
-   { "BR", NULL, "Brazil"},
+   { "BR", "br_flag.png", "Brazil"},
    { "IO", NULL, "British Indian Ocean Territory"},
    { "BN", NULL, "Brunei Darussalam"},
-   { "BG", NULL, "България"},
+   { "BG", "bg_flag.png", "България"},
    { "BF", NULL, "Burkina Faso"},
    { "BI", NULL, "Burundi"},
-   { "KH", NULL, "Cambodia"},
-   { "CM", NULL, "Cameroon"},
-   { "CA", NULL, "Canada"},
+   { "KH", "kh_flag.png", "Cambodia"},
+   { "CM", "cm_flag.png", "Cameroon"},
+   { "CA", "ca_flag.png", "Canada"},
    { "CV", NULL, "Cape Verde"},
    { "KY", NULL, "Cayman Islands"},
    { "CF", NULL, "Central African Republic"},
    { "TD", NULL, "Chad"},
    { "CL", NULL, "Chile"},
-   { "CN", NULL, "中國"},
+   { "CN", "cn_flag.png", "中國"},
    { "CX", NULL, "Christmas Island"},
    { "CC", NULL, "Cocos (keeling) Islands"},
    { "CO", NULL, "Colombia"},
    { "KM", NULL, "Comoros"},
    { "CG", NULL, "Congo"},
-   { "CD", NULL, "Congo"},
+   { "CD", "cd_flag.png", "Congo"},
    { "CK", NULL, "Cook Islands"},
    { "CR", NULL, "Costa Rica"},
    { "CI", NULL, "Cote d'Ivoire"},
-   { "HR", NULL, "Hrvatska"},
+   { "HR", "hr_flag.png", "Hrvatska"},
    { "CU", NULL, "Cuba"},
    { "CY", NULL, "Cyprus"},
-   { "CZ", NULL, "Česká republika"},
-   { "DK", NULL, "Danmark"},
+   { "CZ", "cz_flag.png", "Česká republika"},
+   { "DK", "dk_flag.png", "Danmark"},
    { "DJ", NULL, "Djibouti"},
    { "DM", NULL, "Dominica"},
    { "DO", NULL, "República Dominicana"},
@@ -347,30 +349,30 @@ const E_Intl_Pair region_predefined_pairs[] = {
    { "SV", NULL, "El Salvador"},
    { "GQ", NULL, "Equatorial Guinea"},
    { "ER", NULL, "Eritrea"},
-   { "EE", NULL, "Eesti"},
-   { "ET", NULL, "Ethiopia"},
+   { "EE", "ee_flag.png", "Eesti"},
+   { "ET", "et_flag.png", "Ethiopia"},
    { "FK", NULL, "Falkland Islands (malvinas)"},
-   { "FO", NULL, "Faroe Islands"},
+   { "FO", "fo_flag.png", "Faroe Islands"},
    { "FJ", NULL, "Fiji"},
-   { "FI", NULL, "Finland"},
-   { "FR", NULL, "France"},
+   { "FI", "fi_flag.png", "Finland"},
+   { "FR", "fr_flag.png", "France"},
    { "GF", NULL, "French Guiana"},
    { "PF", NULL, "French Polynesia"},
    { "TF", NULL, "French Southern Territories"},
    { "GA", NULL, "Gabon"},
    { "GM", NULL, "Gambia"},
-   { "GE", NULL, "Georgia"},
-   { "DE", NULL, "Deutschland"},
-   { "GH", NULL, "Ghana"},
+   { "GE", "ge_flag.png", "Georgia"},
+   { "DE", "de_flag.png", "Deutschland"},
+   { "GH", "gh_flag.png", "Ghana"},
    { "GI", NULL, "Gibraltar"},
-   { "GR", NULL, "Greece"},
+   { "GR", "gr_flag.png", "Greece"},
    { "GL", NULL, "Greenland"},
    { "GD", NULL, "Grenada"},
    { "GP", NULL, "Guadeloupe"},
    { "GU", NULL, "Guam"},
    { "GT", NULL, "Guatemala"},
    { "GG", NULL, "Guernsey"},
-   { "GN", NULL, "Guinea"},
+   { "GN", "gn_flag.png", "Guinea"},
    { "GW", NULL, "Guinea-Bissau"},
    { "GY", NULL, "Guyana"},
    { "HT", NULL, "Haiti"},
@@ -378,44 +380,44 @@ const E_Intl_Pair region_predefined_pairs[] = {
    { "VA", NULL, "Holy See (Vatican City State)"},
    { "HN", NULL, "Honduras"},
    { "HK", NULL, "Hong Kong"},
-   { "HU", NULL, "Magyarország"},
-   { "IS", NULL, "Iceland"},
-   { "IN", NULL, "India"},
+   { "HU", "hu_flag.png", "Magyarország"},
+   { "IS", "is_flag.png", "Iceland"},
+   { "IN", "in_flag.png", "India"},
    { "ID", NULL, "Indonesia"},
-   { "IR", NULL, "Iran"},
-   { "IQ", NULL, "Iraq"},
-   { "IE", NULL, "Éire"},
+   { "IR", "ir_flag.png", "Iran"},
+   { "IQ", "iq_flag.png", "Iraq"},
+   { "IE", "ie_flag.png", "Éire"},
    { "IM", NULL, "Isle Of Man"},
-   { "IL", NULL, "Israel"},
-   { "IT", NULL, "Italia"},
+   { "IL", "il_flag.png", "Israel"},
+   { "IT", "it_flag.png", "Italia"},
    { "JM", NULL, "Jamaica"},
-   { "JP", NULL, "日本"},
+   { "JP", "jp_flag.png", "日本"},
    { "JE", NULL, "Jersey"},
    { "JO", NULL, "Jordan"},
-   { "KZ", NULL, "Kazakhstan"},
-   { "KE", NULL, "Kenya"},
+   { "KZ", "kz_flag.png", "Kazakhstan"},
+   { "KE", "ke_flag.png", "Kenya"},
    { "KI", NULL, "Kiribati"},
    { "KP", NULL, "Korea"},
-   { "KR", NULL, "Korea"},
+   { "KR", "kr_flag.png", "Korea"},
    { "KW", NULL, "Kuwait"},
-   { "KG", NULL, "Kyrgyzstan"},
-   { "LA", NULL, "Lao People's Democratic Republic"},
-   { "LV", NULL, "Latvija"},
+   { "KG", "kg_flag.png", "Kyrgyzstan"},
+   { "LA", "la_flag.png", "Lao People's Democratic Republic"},
+   { "LV", "lv_flag.png", "Latvija"},
    { "LB", NULL, "Lebanon"},
    { "LS", NULL, "Lesotho"},
    { "LR", NULL, "Liberia"},
    { "LY", NULL, "Libyan Arab Jamahiriya"},
    { "LI", NULL, "Liechtenstein"},
-   { "LT", NULL, "Lietuva"},
+   { "LT", "lt_flag.png", "Lietuva"},
    { "LU", NULL, "Lëtzebuerg"},
    { "MO", NULL, "Macao"},
-   { "MK", NULL, "Македонија"},
+   { "MK", "mk_flag.png", "Македонија"},
    { "MG", NULL, "Madagascar"},
    { "MW", NULL, "Malawi"},
-   { "MY", NULL, "Malaysia"},
-   { "MV", NULL, "Maldives"},
-   { "ML", NULL, "Mali"},
-   { "MT", NULL, "Malta"},
+   { "MY", "my_flag.png", "Malaysia"},
+   { "MV", "mv_flag.png", "Maldives"},
+   { "ML", "ml_flag.png", "Mali"},
+   { "MT", "mt_flag.png", "Malta"},
    { "MH", NULL, "Marshall Islands"},
    { "MQ", NULL, "Martinique"},
    { "MR", NULL, "Mauritania"},
@@ -425,42 +427,43 @@ const E_Intl_Pair region_predefined_pairs[] = {
    { "FM", NULL, "Micronesia"},
    { "MD", NULL, "Moldova"},
    { "MC", NULL, "Monaco"},
-   { "MN", NULL, "Mongolia"},
+   { "MN", "mn_flag.png", "Mongolia"},
+   { "ME", NULL, "Montenegro"},
    { "MS", NULL, "Montserrat"},
-   { "MA", NULL, "Morocco"},
+   { "MA", "ma_flag.png", "Morocco"},
    { "MZ", NULL, "Mozambique"},
-   { "MM", NULL, "Myanmar"},
+   { "MM", "mm_flag.png", "Myanmar"},
    { "NA", NULL, "Namibia"},
    { "NR", NULL, "Nauru"},
-   { "NP", NULL, "Nepal"},
-   { "NL", NULL, "Nederland"},
+   { "NP", "np_flag.png", "Nepal"},
+   { "NL", "nl_flag.png", "Nederland"},
    { "AN", NULL, "Netherlands Antilles"},
    { "NC", NULL, "New Caledonia"},
    { "NZ", NULL, "New Zealand"},
    { "NI", NULL, "Nicaragua"},
    { "NE", NULL, "Niger"},
-   { "NG", NULL, "Nigeria"},
+   { "NG", "ng_flag.png", "Nigeria"},
    { "NU", NULL, "Niue"},
    { "NF", NULL, "Norfolk Island"},
    { "MP", NULL, "Northern Mariana Islands"},
-   { "NO", NULL, "Norge"},
+   { "NO", "no_flag.png", "Norge"},
    { "OM", NULL, "Oman"},
-   { "PK", NULL, "Pakistan"},
+   { "PK", "pk_flag.png", "Pakistan"},
    { "PW", NULL, "Palau"},
    { "PS", NULL, "Palestinian Territory"},
    { "PA", NULL, "Panama"},
    { "PG", NULL, "Papua New Guinea"},
    { "PY", NULL, "Paraguay"},
    { "PE", NULL, "Peru"},
-   { "PH", NULL, "Philippines"},
+   { "PH", "ph_flag.png", "Philippines"},
    { "PN", NULL, "Pitcairn"},
-   { "PL", NULL, "Poland"},
-   { "PT", NULL, "Portugal"},
+   { "PL", "pl_flag.png", "Poland"},
+   { "PT", "pt_flag.png", "Portugal"},
    { "PR", NULL, "Puerto Rico"},
    { "QA", NULL, "Qatar"},
    { "RE", NULL, "Reunion"},
-   { "RO", NULL, "Romania"},
-   { "RU", NULL, "Russian Federation"},
+   { "RO", "ro_flag.png", "Romania"},
+   { "RU", "ru_flag.png", "Russian Federation"},
    { "RW", NULL, "Rwanda"},
    { "SH", NULL, "Saint Helena"},
    { "KN", NULL, "Saint Kitts and Nevis"},
@@ -471,51 +474,51 @@ const E_Intl_Pair region_predefined_pairs[] = {
    { "SM", NULL, "San Marino"},
    { "ST", NULL, "Sao Tome and Principe"},
    { "SA", NULL, "Saudi Arabia"},
-   { "SN", NULL, "Senegal"},
-   { "CS", NULL, "Serbia and Montenegro"},
+   { "SN", "sn_flag.png", "Senegal"},
+   { "RS", "rs_flag.png", "Serbia"},
    { "SC", NULL, "Seychelles"},
    { "SL", NULL, "Sierra Leone"},
    { "SG", NULL, "Singapore"},
-   { "SK", NULL, "Slovakia"},
-   { "SI", NULL, "Slovenia"},
+   { "SK", "sk_flag.png", "Slovakia"},
+   { "SI", "si_flag.png", "Slovenia"},
    { "SB", NULL, "Solomon Islands"},
    { "SO", NULL, "Somalia"},
-   { "ZA", NULL, "South Africa"},
+   { "ZA", "za_flag.png", "South Africa"},
    { "GS", NULL, "South Georgia and the South Sandwich Islands"},
-   { "ES", NULL, "Spain"},
-   { "LK", NULL, "Sri Lanka"},
+   { "ES", "es_flag.png", "Spain"},
+   { "LK", "lk_flag.png", "Sri Lanka"},
    { "SD", NULL, "Sudan"},
    { "SR", NULL, "Suriname"},
    { "SJ", NULL, "Svalbard and Jan Mayen"},
    { "SZ", NULL, "Swaziland"},
-   { "SE", NULL, "Sweden"},
-   { "CH", NULL, "Switzerland"},
-   { "SY", NULL, "Syrian Arab Republic"},
-   { "TW", NULL, "Taiwan"},
-   { "TJ", NULL, "Tajikistan"},
-   { "TZ", NULL, "Tanzania"},
-   { "TH", NULL, "Thailand"},
+   { "SE", "se_flag.png", "Sweden"},
+   { "CH", "ch_flag.png", "Switzerland"},
+   { "SY", "sy_flag.png", "Syrian Arab Republic"},
+   { "TW", "tw_flag.png", "Taiwan"},
+   { "TJ", "tj_flag.png", "Tajikistan"},
+   { "TZ", "tz_flag.png", "Tanzania"},
+   { "TH", "th_flag.png", "Thailand"},
    { "TL", NULL, "Timor-Leste"},
    { "TG", NULL, "Togo"},
    { "TK", NULL, "Tokelau"},
    { "TO", NULL, "Tonga"},
    { "TT", NULL, "Trinidad and Tobago"},
    { "TN", NULL, "Tunisia"},
-   { "TR", NULL, "Turkey"},
-   { "TM", NULL, "Turkmenistan"},
+   { "TR", "tr_flag.png", "Turkey"},
+   { "TM", "tm_flag.png", "Turkmenistan"},
    { "TC", NULL, "Turks and Caicos Islands"},
    { "TV", NULL, "Tuvalu"},
    { "UG", NULL, "Uganda"},
-   { "UA", NULL, "Ukraine"},
+   { "UA", "ua_flag.png", "Ukraine"},
    { "AE", NULL, "United Arab Emirates"},
-   { "GB", NULL, "United Kingdom"},
-   { "US", NULL, "United States"},
+   { "GB", "gb_flag.png", "United Kingdom"},
+   { "US", "us_flag.png", "United States"},
    { "UM", NULL, "United States Minor Outlying Islands"},
    { "UY", NULL, "Uruguay"},
-   { "UZ", NULL, "Uzbekistan"},
+   { "UZ", "uz_flag.png", "Uzbekistan"},
    { "VU", NULL, "Vanuatu"},
    { "VE", NULL, "Venezuela"},
-   { "VN", NULL, "Viet Nam"},
+   { "VN", "vn_flag.png", "Viet Nam"},
    { "VG", NULL, "Virgin Islands"},
    { "VI", NULL, "Virgin Islands"},
    { "WF", NULL, "Wallis and Futuna"},
@@ -695,6 +698,7 @@ _fill_data(E_Config_Dialog_Data *cfdata)
                                  if (!strcmp(language_predefined_pairs[i].locale_key, locale_parts->lang))
                                    {
                                       lang_node->lang_name = _(language_predefined_pairs[i].locale_translation);
+                                      lang_node->lang_icon = language_predefined_pairs[i].locale_icon;
                                       break;
                                    }
                                  i++;
@@ -729,6 +733,7 @@ _fill_data(E_Config_Dialog_Data *cfdata)
                                       if (!strcmp(region_predefined_pairs[i].locale_key, locale_parts->region))
                                         {
                                            region_node->region_name = _(region_predefined_pairs[i].locale_translation);
+                                           region_node->region_icon = region_predefined_pairs[i].locale_icon;
                                            break;
                                         }
                                       i++;
@@ -1490,6 +1495,8 @@ _region_list_load(void *data)
 {
    E_Config_Dialog_Data *cfdata;
    Eina_List *l;
+   Evas_Object *ic;
+   char buf[PATH_MAX];
 
    if (!data) return;
 
@@ -1512,7 +1519,14 @@ _region_list_load(void *data)
         else
           trans = rn->region_code;
 
-        e_widget_ilist_append(cfdata->gui.reg_list, NULL, trans, NULL, NULL, rn->region_code);
+        if (rn->region_icon)
+          {
+             e_prefix_data_snprintf(buf, sizeof(buf), "data/flags/%s", rn->region_icon);
+             ic = e_util_icon_add(buf, cfdata->evas);
+          }
+        else
+          ic = NULL;
+        e_widget_ilist_append(cfdata->gui.reg_list, ic, trans, NULL, NULL, rn->region_code);
 
         if (cfdata->cur_reg && !strcmp(cfdata->cur_reg, rn->region_code))
           {