FDO icons: added International flags

data/Makefile.am

@@ -177,6 +177,9 @@ elementaryfdo_devices_128_DATA = $(elementary_fdo_devices_128_files)
 elementaryfdo_apps_64dir = $(datadir)/icons/Enlightenment-X/apps/64
 elementaryfdo_apps_64_DATA = $(elementary_fdo_apps_64_files)
 
+elementaryfdo_intl_128dir = $(datadir)/icons/Enlightenment-X/intl/128
+elementaryfdo_intl_128_DATA = $(elementary_fdo_intl_128_files)
+
 # edje_externals
 
 elementaryedje_externalsdir = $(datadir)/elementary/edje_externals

data/elementary/themes/Makefile.am

@@ -1346,6 +1346,100 @@ elementary_fdo_apps_64_files = \
 	elementary/themes/fdo/apps/64/preferences-desktop-wallpaper.png \
 	elementary/themes/fdo/apps/64/preferences-profile.png
 
+elementary_fdo_intl_128_files = \
+	elementary/themes/fdo/intl/128/flag-ad.png \
+	elementary/themes/fdo/intl/128/flag-af.png \
+	elementary/themes/fdo/intl/128/flag-al.png \
+	elementary/themes/fdo/intl/128/flag-am.png \
+	elementary/themes/fdo/intl/128/flag-ar.png \
+	elementary/themes/fdo/intl/128/flag-at.png \
+	elementary/themes/fdo/intl/128/flag-au.png \
+	elementary/themes/fdo/intl/128/flag-az.png \
+	elementary/themes/fdo/intl/128/flag-ba.png \
+	elementary/themes/fdo/intl/128/flag-bd.png \
+	elementary/themes/fdo/intl/128/flag-be.png \
+	elementary/themes/fdo/intl/128/flag-bg.png \
+	elementary/themes/fdo/intl/128/flag-br.png \
+	elementary/themes/fdo/intl/128/flag-bt.png \
+	elementary/themes/fdo/intl/128/flag-bw.png \
+	elementary/themes/fdo/intl/128/flag-by.png \
+	elementary/themes/fdo/intl/128/flag-ca.png \
+	elementary/themes/fdo/intl/128/flag-cd.png \
+	elementary/themes/fdo/intl/128/flag-ch.png \
+	elementary/themes/fdo/intl/128/flag-cm.png \
+	elementary/themes/fdo/intl/128/flag-cn.png \
+	elementary/themes/fdo/intl/128/flag-cz.png \
+	elementary/themes/fdo/intl/128/flag-de.png \
+	elementary/themes/fdo/intl/128/flag-dk.png \
+	elementary/themes/fdo/intl/128/flag-ee.png \
+	elementary/themes/fdo/intl/128/flag-es.png \
+	elementary/themes/fdo/intl/128/flag-et.png \
+	elementary/themes/fdo/intl/128/flag-fi.png \
+	elementary/themes/fdo/intl/128/flag-fo.png \
+	elementary/themes/fdo/intl/128/flag-fr.png \
+	elementary/themes/fdo/intl/128/flag-gb.png \
+	elementary/themes/fdo/intl/128/flag-ge.png \
+	elementary/themes/fdo/intl/128/flag-gh.png \
+	elementary/themes/fdo/intl/128/flag-gn.png \
+	elementary/themes/fdo/intl/128/flag-gr.png \
+	elementary/themes/fdo/intl/128/flag-hr.png \
+	elementary/themes/fdo/intl/128/flag-hu.png \
+	elementary/themes/fdo/intl/128/flag-ie.png \
+	elementary/themes/fdo/intl/128/flag-il.png \
+	elementary/themes/fdo/intl/128/flag-in.png \
+	elementary/themes/fdo/intl/128/flag-iq.png \
+	elementary/themes/fdo/intl/128/flag-ir.png \
+	elementary/themes/fdo/intl/128/flag-is.png \
+	elementary/themes/fdo/intl/128/flag-it.png \
+	elementary/themes/fdo/intl/128/flag-jp.png \
+	elementary/themes/fdo/intl/128/flag-ke.png \
+	elementary/themes/fdo/intl/128/flag-kg.png \
+	elementary/themes/fdo/intl/128/flag-kh.png \
+	elementary/themes/fdo/intl/128/flag-kr.png \
+	elementary/themes/fdo/intl/128/flag-ku.png \
+	elementary/themes/fdo/intl/128/flag-kz.png \
+	elementary/themes/fdo/intl/128/flag-la.png \
+	elementary/themes/fdo/intl/128/flag-lk.png \
+	elementary/themes/fdo/intl/128/flag-lt.png \
+	elementary/themes/fdo/intl/128/flag-lv.png \
+	elementary/themes/fdo/intl/128/flag-ma.png \
+	elementary/themes/fdo/intl/128/flag-md.png \
+	elementary/themes/fdo/intl/128/flag-me.png \
+	elementary/themes/fdo/intl/128/flag-mk.png \
+	elementary/themes/fdo/intl/128/flag-ml.png \
+	elementary/themes/fdo/intl/128/flag-mm.png \
+	elementary/themes/fdo/intl/128/flag-mn.png \
+	elementary/themes/fdo/intl/128/flag-mt.png \
+	elementary/themes/fdo/intl/128/flag-mv.png \
+	elementary/themes/fdo/intl/128/flag-my.png \
+	elementary/themes/fdo/intl/128/flag-ng.png \
+	elementary/themes/fdo/intl/128/flag-nl.png \
+	elementary/themes/fdo/intl/128/flag-no.png \
+	elementary/themes/fdo/intl/128/flag-np.png \
+	elementary/themes/fdo/intl/128/flag-ph.png \
+	elementary/themes/fdo/intl/128/flag-pk.png \
+	elementary/themes/fdo/intl/128/flag-pl.png \
+	elementary/themes/fdo/intl/128/flag-pt.png \
+	elementary/themes/fdo/intl/128/flag-ro.png \
+	elementary/themes/fdo/intl/128/flag-rs.png \
+	elementary/themes/fdo/intl/128/flag-ru.png \
+	elementary/themes/fdo/intl/128/flag-se.png \
+	elementary/themes/fdo/intl/128/flag-si.png \
+	elementary/themes/fdo/intl/128/flag-sk.png \
+	elementary/themes/fdo/intl/128/flag-sn.png \
+	elementary/themes/fdo/intl/128/flag-sy.png \
+	elementary/themes/fdo/intl/128/flag-th.png \
+	elementary/themes/fdo/intl/128/flag-tj.png \
+	elementary/themes/fdo/intl/128/flag-tm.png \
+	elementary/themes/fdo/intl/128/flag-tr.png \
+	elementary/themes/fdo/intl/128/flag-tw.png \
+	elementary/themes/fdo/intl/128/flag-tz.png \
+	elementary/themes/fdo/intl/128/flag-ua.png \
+	elementary/themes/fdo/intl/128/flag-us.png \
+	elementary/themes/fdo/intl/128/flag-uz.png \
+	elementary/themes/fdo/intl/128/flag-vn.png \
+	elementary/themes/fdo/intl/128/flag-za.png
+
 
 elementary_fdo_files = \
 	$(elementary_fdo_actions_128_files) \
@@ -1356,7 +1450,8 @@ elementary_fdo_files = \
 	$(elementary_fdo_places_128_files) \
 	$(elementary_fdo_status_128_files) \
 	$(elementary_fdo_devices_128_files) \
-	$(elementary_fdo_apps_64_files)
+	$(elementary_fdo_apps_64_files) \
+	$(elementary_fdo_intl_128_files)
 
 
 EXTRA_DIST += $(elementary_themes_files) $(elementary_fdo_files)

data/elementary/themes/edc/elm/icon_fdo.edc

@@ -61,7 +61,17 @@
    }  }  }  }
 
 
-
+// Flag icon
+#define FLAG(Cat, Name)                                     \
+   group { name: "elm/icon/"##Name##"/default";             \
+      min: 16 16;                                           \
+      images.image: ##Cat##"/128/"##Name##".png" COMP;      \
+      parts {                                               \
+         part { name: "base";                               \
+            desc {                                          \
+               image.normal: ##Cat##"/128/"##Name##".png";  \
+               aspect_preference: SOURCE;                   \
+   }  }  }  }
 
 
 ////  places  /////////////////////////////////////////////////////////////////
@@ -479,8 +489,100 @@ ICO1(CTX, "network-wireless", 128)
 
 
 ////  international  //////////////////////////////////////////////////////////
-#define CTX "international"
-// TODO flag-aa (The flag for the country with the ISO 3166 country code AA)
+// Country flags, ISO 3166-1 alpha-2 country code (flag-aa)
+#define CTX "intl"
+FLAG(CTX, "flag-ad")
+FLAG(CTX, "flag-af")
+FLAG(CTX, "flag-al")
+FLAG(CTX, "flag-am")
+FLAG(CTX, "flag-ar")
+FLAG(CTX, "flag-at")
+FLAG(CTX, "flag-au")
+FLAG(CTX, "flag-az")
+FLAG(CTX, "flag-ba")
+FLAG(CTX, "flag-bd")
+FLAG(CTX, "flag-be")
+FLAG(CTX, "flag-bg")
+FLAG(CTX, "flag-br")
+FLAG(CTX, "flag-bt")
+FLAG(CTX, "flag-bw")
+FLAG(CTX, "flag-by")
+FLAG(CTX, "flag-ca")
+FLAG(CTX, "flag-cd")
+FLAG(CTX, "flag-ch")
+FLAG(CTX, "flag-cm")
+FLAG(CTX, "flag-cn")
+FLAG(CTX, "flag-cz")
+FLAG(CTX, "flag-de")
+FLAG(CTX, "flag-dk")
+FLAG(CTX, "flag-ee")
+FLAG(CTX, "flag-es")
+FLAG(CTX, "flag-et")
+FLAG(CTX, "flag-fi")
+FLAG(CTX, "flag-fo")
+FLAG(CTX, "flag-fr")
+FLAG(CTX, "flag-gb")
+FLAG(CTX, "flag-ge")
+FLAG(CTX, "flag-gh")
+FLAG(CTX, "flag-gn")
+FLAG(CTX, "flag-gr")
+FLAG(CTX, "flag-hr")
+FLAG(CTX, "flag-hu")
+FLAG(CTX, "flag-ie")
+FLAG(CTX, "flag-il")
+FLAG(CTX, "flag-in")
+FLAG(CTX, "flag-iq")
+FLAG(CTX, "flag-ir")
+FLAG(CTX, "flag-is")
+FLAG(CTX, "flag-it")
+FLAG(CTX, "flag-jp")
+FLAG(CTX, "flag-ke")
+FLAG(CTX, "flag-kg")
+FLAG(CTX, "flag-kh")
+FLAG(CTX, "flag-kr")
+FLAG(CTX, "flag-ku")
+FLAG(CTX, "flag-kz")
+FLAG(CTX, "flag-la")
+FLAG(CTX, "flag-lk")
+FLAG(CTX, "flag-lt")
+FLAG(CTX, "flag-lv")
+FLAG(CTX, "flag-ma")
+FLAG(CTX, "flag-md")
+FLAG(CTX, "flag-me")
+FLAG(CTX, "flag-mk")
+FLAG(CTX, "flag-ml")
+FLAG(CTX, "flag-mm")
+FLAG(CTX, "flag-mn")
+FLAG(CTX, "flag-mt")
+FLAG(CTX, "flag-mv")
+FLAG(CTX, "flag-my")
+FLAG(CTX, "flag-ng")
+FLAG(CTX, "flag-nl")
+FLAG(CTX, "flag-no")
+FLAG(CTX, "flag-np")
+FLAG(CTX, "flag-ph")
+FLAG(CTX, "flag-pk")
+FLAG(CTX, "flag-pl")
+FLAG(CTX, "flag-pt")
+FLAG(CTX, "flag-ro")
+FLAG(CTX, "flag-rs")
+FLAG(CTX, "flag-ru")
+FLAG(CTX, "flag-se")
+FLAG(CTX, "flag-si")
+FLAG(CTX, "flag-sk")
+FLAG(CTX, "flag-sn")
+FLAG(CTX, "flag-sy")
+FLAG(CTX, "flag-th")
+FLAG(CTX, "flag-tj")
+FLAG(CTX, "flag-tm")
+FLAG(CTX, "flag-tr")
+FLAG(CTX, "flag-tw")
+FLAG(CTX, "flag-tz")
+FLAG(CTX, "flag-ua")
+FLAG(CTX, "flag-us")
+FLAG(CTX, "flag-uz")
+FLAG(CTX, "flag-vn")
+FLAG(CTX, "flag-za")
 #undef CTX
 
 
@@ -492,4 +594,5 @@ ICO1(CTX, "network-wireless", 128)
 
 #undef ICO1
 #undef ICO2
+#undef FLAG
 

src/bin/elementary/test_icon.c

@@ -521,6 +521,100 @@ _standard_genlist_populate(Evas_Object *gl)
    IC("preferences-desktop-theme")
    IC("preferences-desktop-wallpaper")
 
+   CONTEXT("International")
+   IC("flag-ad")
+   IC("flag-af")
+   IC("flag-al")
+   IC("flag-am")
+   IC("flag-ar")
+   IC("flag-at")
+   IC("flag-au")
+   IC("flag-az")
+   IC("flag-ba")
+   IC("flag-bd")
+   IC("flag-be")
+   IC("flag-bg")
+   IC("flag-br")
+   IC("flag-bt")
+   IC("flag-bw")
+   IC("flag-by")
+   IC("flag-ca")
+   IC("flag-cd")
+   IC("flag-ch")
+   IC("flag-cm")
+   IC("flag-cn")
+   IC("flag-cz")
+   IC("flag-de")
+   IC("flag-dk")
+   IC("flag-ee")
+   IC("flag-es")
+   IC("flag-et")
+   IC("flag-fi")
+   IC("flag-fo")
+   IC("flag-fr")
+   IC("flag-gb")
+   IC("flag-ge")
+   IC("flag-gh")
+   IC("flag-gn")
+   IC("flag-gr")
+   IC("flag-hr")
+   IC("flag-hu")
+   IC("flag-ie")
+   IC("flag-il")
+   IC("flag-in")
+   IC("flag-iq")
+   IC("flag-ir")
+   IC("flag-is")
+   IC("flag-it")
+   IC("flag-jp")
+   IC("flag-ke")
+   IC("flag-kg")
+   IC("flag-kh")
+   IC("flag-kr")
+   IC("flag-ku")
+   IC("flag-kz")
+   IC("flag-la")
+   IC("flag-lk")
+   IC("flag-lt")
+   IC("flag-lv")
+   IC("flag-ma")
+   IC("flag-md")
+   IC("flag-me")
+   IC("flag-mk")
+   IC("flag-ml")
+   IC("flag-mm")
+   IC("flag-mn")
+   IC("flag-mt")
+   IC("flag-mv")
+   IC("flag-my")
+   IC("flag-ng")
+   IC("flag-nl")
+   IC("flag-no")
+   IC("flag-np")
+   IC("flag-ph")
+   IC("flag-pk")
+   IC("flag-pl")
+   IC("flag-pt")
+   IC("flag-ro")
+   IC("flag-rs")
+   IC("flag-ru")
+   IC("flag-se")
+   IC("flag-si")
+   IC("flag-sk")
+   IC("flag-sn")
+   IC("flag-sy")
+   IC("flag-th")
+   IC("flag-tj")
+   IC("flag-tm")
+   IC("flag-tr")
+   IC("flag-tw")
+   IC("flag-tz")
+   IC("flag-ua")
+   IC("flag-us")
+   IC("flag-uz")
+   IC("flag-vn")
+   IC("flag-za")
+
 #undef CONTEXT
 #undef IC