davemds pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=771a3da65027c9bcf3619a29ca2c7ce45a5f3573
commit 771a3da65027c9bcf3619a29ca2c7ce45a5f3573 Author: Dave Andreoli <[email protected]> Date: Sun May 15 15:30:41 2016 +0200 FDO icons: add some Application icons mostly the ones used by elm_config --- data/elementary/themes/Makefile.am | 3 +- data/elementary/themes/edc/elm/icon_fdo.edc | 37 +++++++++++---------- .../themes/fdo/apps/64/preferences-color.png | Bin 0 -> 3571 bytes .../fdo/apps/64/preferences-desktop-display.png | Bin 0 -> 1610 bytes .../fdo/apps/64/preferences-desktop-font.png | Bin 0 -> 2328 bytes .../fdo/apps/64/preferences-desktop-keyboard.png | Bin 0 -> 2232 bytes .../fdo/apps/64/preferences-desktop-locale.png | Bin 0 -> 2316 bytes .../fdo/apps/64/preferences-desktop-multimedia.png | Bin 0 -> 3020 bytes .../apps/64/preferences-desktop-screensaver.png | Bin 0 -> 4301 bytes .../fdo/apps/64/preferences-desktop-theme.png | Bin 0 -> 5162 bytes .../fdo/apps/64/preferences-desktop-wallpaper.png | Bin 0 -> 1501 bytes .../themes/fdo/apps/64/preferences-profile.png | Bin 0 -> 1650 bytes data/elementary/themes/fdo/index.theme | 13 +++++--- src/bin/elementary/test_icon.c | 12 +++++++ 14 files changed, 42 insertions(+), 23 deletions(-) diff --git a/data/elementary/themes/Makefile.am b/data/elementary/themes/Makefile.am index 3586c85..ccf2937 100644 --- a/data/elementary/themes/Makefile.am +++ b/data/elementary/themes/Makefile.am @@ -992,7 +992,8 @@ elementary/themes/fdo/categories/128 \ elementary/themes/fdo/emblems/96 \ elementary/themes/fdo/places/16 \ elementary/themes/fdo/places/128 \ -elementary/themes/fdo/status/128 +elementary/themes/fdo/status/128 \ +elementary/themes/fdo/apps/64 EXTRA_DIST += $(elementary_themes_files) diff --git a/data/elementary/themes/edc/elm/icon_fdo.edc b/data/elementary/themes/edc/elm/icon_fdo.edc index 3203c63..c55ffc1 100644 --- a/data/elementary/themes/edc/elm/icon_fdo.edc +++ b/data/elementary/themes/edc/elm/icon_fdo.edc @@ -15,9 +15,9 @@ * * NOTE: if you add an new icon you must add it to: * - this file (of course) + * - src/bin/elementary/test_icon.c (elementary_test -to "Icon Standard") * - data/elementary/themes/Makefile.am (only for new dirs) * - elm_icon documentation ????? really? - * - check they appear in: elementary_test -to "Icon Standard" * - don't forget to run "make distcheck" * */ @@ -120,12 +120,12 @@ ICO1(CTX, "document-save", 128) ICO1(CTX, "document-save-as", 128) ICO1(CTX, "document-send", 128) ICO1(CTX, "document-close", 128) /* */ -ICO1(CTX, "document-new", 128); -ICO1(CTX, "document-print", 128); -ICO1(CTX, "document-print-preview", 128); -ICO1(CTX, "document-revert", 128); -ICO1(CTX, "document-export", 128); /* */ -ICO1(CTX, "document-import", 128); /* */ +ICO1(CTX, "document-new", 128) +ICO1(CTX, "document-print", 128) +ICO1(CTX, "document-print-preview", 128) +ICO1(CTX, "document-revert", 128) +ICO1(CTX, "document-export", 128) /* */ +ICO1(CTX, "document-import", 128) /* */ ICO1(CTX, "edit-clear", 128) ICO1(CTX, "edit-copy", 128) @@ -350,26 +350,29 @@ ICO1(CTX, "non-starred", 128) /* */ //// applications /////////////////////////////////////////////////////////// -#define CTX "applications" +#define CTX "apps" // TODO accessories-calculator // TODO accessories-character-map // TODO accessories-dictionary // TODO accessories-text-editor -// TODO help-browser // TODO multimedia-volume-control +// TODO help-browser +ICO1(CTX, "preferences-color", 64) /* */ +ICO1(CTX, "preferences-profile", 64) /* Elm specific */ // TODO preferences-desktop-accessibility -// TODO preferences-desktop-font -// TODO preferences-desktop-keyboard -// TODO preferences-desktop-locale -// TODO preferences-desktop-multimedia -// TODO preferences-desktop-screensaver -// TODO preferences-desktop-theme -// TODO preferences-desktop-wallpaper -// TODO system-file-manager +ICO1(CTX, "preferences-desktop-display", 64) /* */ +ICO1(CTX, "preferences-desktop-font", 64) +ICO1(CTX, "preferences-desktop-keyboard", 64) +ICO1(CTX, "preferences-desktop-locale", 64) +ICO1(CTX, "preferences-desktop-multimedia", 64) +ICO1(CTX, "preferences-desktop-screensaver", 64) +ICO1(CTX, "preferences-desktop-theme", 64) +ICO1(CTX, "preferences-desktop-wallpaper", 64) // TODO system-software-install // TODO system-software-update // TODO utilities-system-monitor // TODO utilities-terminal +// TODO system-file-manager #undef CTX diff --git a/data/elementary/themes/fdo/apps/64/preferences-color.png b/data/elementary/themes/fdo/apps/64/preferences-color.png new file mode 100644 index 0000000..6743559 Binary files /dev/null and b/data/elementary/themes/fdo/apps/64/preferences-color.png differ diff --git a/data/elementary/themes/fdo/apps/64/preferences-desktop-display.png b/data/elementary/themes/fdo/apps/64/preferences-desktop-display.png new file mode 100644 index 0000000..fb6a85e Binary files /dev/null and b/data/elementary/themes/fdo/apps/64/preferences-desktop-display.png differ diff --git a/data/elementary/themes/fdo/apps/64/preferences-desktop-font.png b/data/elementary/themes/fdo/apps/64/preferences-desktop-font.png new file mode 100644 index 0000000..9171dbf Binary files /dev/null and b/data/elementary/themes/fdo/apps/64/preferences-desktop-font.png differ diff --git a/data/elementary/themes/fdo/apps/64/preferences-desktop-keyboard.png b/data/elementary/themes/fdo/apps/64/preferences-desktop-keyboard.png new file mode 100644 index 0000000..4bbd8b1 Binary files /dev/null and b/data/elementary/themes/fdo/apps/64/preferences-desktop-keyboard.png differ diff --git a/data/elementary/themes/fdo/apps/64/preferences-desktop-locale.png b/data/elementary/themes/fdo/apps/64/preferences-desktop-locale.png new file mode 100644 index 0000000..826c749 Binary files /dev/null and b/data/elementary/themes/fdo/apps/64/preferences-desktop-locale.png differ diff --git a/data/elementary/themes/fdo/apps/64/preferences-desktop-multimedia.png b/data/elementary/themes/fdo/apps/64/preferences-desktop-multimedia.png new file mode 100644 index 0000000..e5e3b0e Binary files /dev/null and b/data/elementary/themes/fdo/apps/64/preferences-desktop-multimedia.png differ diff --git a/data/elementary/themes/fdo/apps/64/preferences-desktop-screensaver.png b/data/elementary/themes/fdo/apps/64/preferences-desktop-screensaver.png new file mode 100644 index 0000000..8b749b6 Binary files /dev/null and b/data/elementary/themes/fdo/apps/64/preferences-desktop-screensaver.png differ diff --git a/data/elementary/themes/fdo/apps/64/preferences-desktop-theme.png b/data/elementary/themes/fdo/apps/64/preferences-desktop-theme.png new file mode 100644 index 0000000..15a14f8 Binary files /dev/null and b/data/elementary/themes/fdo/apps/64/preferences-desktop-theme.png differ diff --git a/data/elementary/themes/fdo/apps/64/preferences-desktop-wallpaper.png b/data/elementary/themes/fdo/apps/64/preferences-desktop-wallpaper.png new file mode 100644 index 0000000..ae9f97a Binary files /dev/null and b/data/elementary/themes/fdo/apps/64/preferences-desktop-wallpaper.png differ diff --git a/data/elementary/themes/fdo/apps/64/preferences-profile.png b/data/elementary/themes/fdo/apps/64/preferences-profile.png new file mode 100644 index 0000000..37c0255 Binary files /dev/null and b/data/elementary/themes/fdo/apps/64/preferences-profile.png differ diff --git a/data/elementary/themes/fdo/index.theme b/data/elementary/themes/fdo/index.theme index b366d86..3bb3a24 100644 --- a/data/elementary/themes/fdo/index.theme +++ b/data/elementary/themes/fdo/index.theme @@ -2,7 +2,7 @@ Name=Bluish-X Inherits=hicolor Comment=The EFL Bluish-X Icon theme. Orig. Based on Rave-X, Mint-X and Faenza Icon Themes. -Directories=actions/128,status/128,places/128,places/16,emblems/96,categories/128,categories/16 +Directories=actions/128,status/128,places/128,places/16,emblems/96,categories/128,categories/16,apps/64 Example=folder-home @@ -20,7 +20,6 @@ Type=Scalable MinSize=16 MaxSize=22 - [emblems/96] Size=96 Context=Emblems @@ -28,7 +27,6 @@ Type=Scalable MinSize=8 MaxSize=256 - [categories/128] Size=128 Context=Categories @@ -43,7 +41,6 @@ Type=Scalable MinSize=16 MaxSize=22 - [actions/128] Size=128 Context=Actions @@ -51,7 +48,6 @@ Type=Scalable MinSize=16 MaxSize=256 - [status/128] Size=128 Context=Status @@ -59,4 +55,11 @@ Type=Scalable MinSize=16 MaxSize=256 +[apps/64] +Size=64 +Context=Applications +Type=Scalable +MinSize=16 +MaxSize=128 + diff --git a/src/bin/elementary/test_icon.c b/src/bin/elementary/test_icon.c index a70568d..8ac3387 100644 --- a/src/bin/elementary/test_icon.c +++ b/src/bin/elementary/test_icon.c @@ -432,6 +432,18 @@ _standard_genlist_populate(Evas_Object *gl) IC("preferences-system") IC("preferences-other") + CONTEXT("Applications") + IC("preferences-color") + IC("preferences-profile") + IC("preferences-desktop-display") + IC("preferences-desktop-font") + IC("preferences-desktop-keyboard") + IC("preferences-desktop-locale") + IC("preferences-desktop-multimedia") + IC("preferences-desktop-screensaver") + IC("preferences-desktop-theme") + IC("preferences-desktop-wallpaper") + #undef CONTEXT #undef IC --
