davemds pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=94433af83a0a0560df32d47d7f48a136b16e0d80
commit 94433af83a0a0560df32d47d7f48a136b16e0d80 Author: Dave Andreoli <[email protected]> Date: Mon Apr 2 14:44:44 2018 +0200 FDO icons: add the inode-directory icon This icon is used by some filemanager (like thunar) instead of the standard "folder" one... make them happy. --- data/Makefile.am | 6 ++++++ data/elementary/themes/Makefile.am | 10 +++++++++- data/elementary/themes/edc/elm/icon_fdo.edc | 2 ++ data/elementary/themes/fdo/index.theme | 16 +++++++++++++++- .../themes/fdo/mimetypes/128/inode-directory.png | Bin 0 -> 2436 bytes .../themes/fdo/mimetypes/16/inode-directory.png | Bin 0 -> 466 bytes src/bin/elementary/test_icon.c | 3 +++ 7 files changed, 35 insertions(+), 2 deletions(-) diff --git a/data/Makefile.am b/data/Makefile.am index 8fc26addb3..19c056f789 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -177,6 +177,12 @@ 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) +elementaryfdo_mimetypes_16dir = $(datadir)/icons/Enlightenment-X/mimetypes/16 +elementaryfdo_mimetypes_16_DATA = $(elementary_fdo_mimetypes_16_files) + +elementaryfdo_mimetypes_128dir = $(datadir)/icons/Enlightenment-X/mimetypes/128 +elementaryfdo_mimetypes_128_DATA = $(elementary_fdo_mimetypes_128_files) + # edje_externals elementaryedje_externalsdir = $(datadir)/elementary/edje_externals diff --git a/data/elementary/themes/Makefile.am b/data/elementary/themes/Makefile.am index 74ba32fa63..bc2025eba2 100644 --- a/data/elementary/themes/Makefile.am +++ b/data/elementary/themes/Makefile.am @@ -1492,6 +1492,12 @@ elementary_fdo_intl_128_files = \ elementary/themes/fdo/intl/128/flag-vn.png \ elementary/themes/fdo/intl/128/flag-za.png +elementary_fdo_mimetypes_16_files = \ + elementary/themes/fdo/mimetypes/16/inode-directory.png + +elementary_fdo_mimetypes_128_files = \ + elementary/themes/fdo/mimetypes/128/inode-directory.png + elementary_fdo_files = \ $(elementary_fdo_actions_128_files) \ @@ -1503,7 +1509,9 @@ elementary_fdo_files = \ $(elementary_fdo_status_128_files) \ $(elementary_fdo_devices_128_files) \ $(elementary_fdo_apps_64_files) \ - $(elementary_fdo_intl_128_files) + $(elementary_fdo_intl_128_files) \ + $(elementary_fdo_mimetypes_16_files) \ + $(elementary_fdo_mimetypes_128_files) EXTRA_DIST += $(elementary_themes_files) $(efl_ui_themes_files) $(elementary_fdo_files) diff --git a/data/elementary/themes/edc/elm/icon_fdo.edc b/data/elementary/themes/edc/elm/icon_fdo.edc index c608afd115..86659b4716 100644 --- a/data/elementary/themes/edc/elm/icon_fdo.edc +++ b/data/elementary/themes/edc/elm/icon_fdo.edc @@ -18,6 +18,7 @@ * - src/bin/elementary/test_icon.c (elementary_test -to "Icon Standard") * - data/elementary/themes/Makefile.am * - data/Makefile.am (only for new dirs) + * - data/elementary/themes/fdo/index.theme (only for new dirs) * - elm_icon documentation ????? really? * - don't forget to run "make distcheck" * @@ -588,6 +589,7 @@ FLAG(CTX, "flag-za") //// mimetypes ////////////////////////////////////////////////////////////// #define CTX "mimetypes" +ICO2(CTX, "inode-directory") // TODO ... don't really know about this one (they are LOTS of icons) #undef CTX diff --git a/data/elementary/themes/fdo/index.theme b/data/elementary/themes/fdo/index.theme index cc96656e44..d1b1e2f9d3 100644 --- a/data/elementary/themes/fdo/index.theme +++ b/data/elementary/themes/fdo/index.theme @@ -2,7 +2,7 @@ Name=Enlightenment-X Inherits=Mint-X,RAVE-X,Faenza,hicolor Comment=The Enlightenment-X Icon theme. Orig. based on Rave-X, Mint-X and Faenza Icon Themes. -Directories=actions/128,status/128,places/128,places/16,devices/128,emblems/96,categories/128,categories/16,apps/64,intl/128 +Directories=actions/128,status/128,places/128,places/16,devices/128,emblems/96,categories/128,categories/16,apps/64,intl/128,mimetypes/16,mimetypes/128 Example=folder-home @@ -75,3 +75,17 @@ Context=International Type=Scalable MinSize=16 MaxSize=256 + +[mimetypes/128] +Size=128 +Context=MimeTypes +Type=Scalable +MinSize=23 +MaxSize=256 + +[mimetypes/16] +Size=16 +Context=MimeTypes +Type=Scalable +MinSize=16 +MaxSize=22 diff --git a/data/elementary/themes/fdo/mimetypes/128/inode-directory.png b/data/elementary/themes/fdo/mimetypes/128/inode-directory.png new file mode 100644 index 0000000000..e877858b4c Binary files /dev/null and b/data/elementary/themes/fdo/mimetypes/128/inode-directory.png differ diff --git a/data/elementary/themes/fdo/mimetypes/16/inode-directory.png b/data/elementary/themes/fdo/mimetypes/16/inode-directory.png new file mode 100644 index 0000000000..d2f27d6e16 Binary files /dev/null and b/data/elementary/themes/fdo/mimetypes/16/inode-directory.png differ diff --git a/src/bin/elementary/test_icon.c b/src/bin/elementary/test_icon.c index 9fa7dc7afe..ecd810baa9 100644 --- a/src/bin/elementary/test_icon.c +++ b/src/bin/elementary/test_icon.c @@ -626,6 +626,9 @@ _standard_genlist_populate(Evas_Object *gl) IC("flag-vn") IC("flag-za") + CONTEXT("Mimetypes") + IC("inode-directory") + #undef CONTEXT #undef IC --
