davemds pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=ca687f4698d796e5a608e2062adee91706cb4d1a
commit ca687f4698d796e5a608e2062adee91706cb4d1a Author: Dave Andreoli <d...@gurumeditation.it> Date: Sat May 7 14:16:01 2016 +0200 FDO icons: convert the Emblems ctx to png --- data/elementary/themes/Makefile.am | 2 +- data/elementary/themes/edc/elm/icon_fdo.edc | 58 ++++++++++----------- .../{scalable => 96-svg}/emblem-default.svg | 0 .../{scalable => 96-svg}/emblem-downloads.svg | 0 .../{scalable => 96-svg}/emblem-favorite.svg | 0 .../{scalable => 96-svg}/emblem-important.svg | 0 .../{scalable => 96-svg}/emblem-readonly.svg | 0 .../emblems/{scalable => 96-svg}/emblem-shared.svg | 0 .../{scalable => 96-svg}/emblem-symbolic-link.svg | 0 .../{scalable => 96-svg}/emblem-synchronized.svg | 0 .../{scalable => 96-svg}/emblem-synchronizing.svg | 0 .../emblems/{scalable => 96-svg}/emblem-system.svg | 0 .../{scalable => 96-svg}/emblem-unreadable.svg | 0 .../themes/fdo/emblems/96/emblem-default.png | Bin 0 -> 6927 bytes .../themes/fdo/emblems/96/emblem-downloads.png | Bin 0 -> 2943 bytes .../themes/fdo/emblems/96/emblem-favorite.png | Bin 0 -> 5082 bytes .../themes/fdo/emblems/96/emblem-important.png | Bin 0 -> 2847 bytes .../themes/fdo/emblems/96/emblem-readonly.png | Bin 0 -> 3629 bytes .../themes/fdo/emblems/96/emblem-shared.png | Bin 0 -> 5022 bytes .../themes/fdo/emblems/96/emblem-symbolic-link.png | Bin 0 -> 4063 bytes .../themes/fdo/emblems/96/emblem-synchronized.png | Bin 0 -> 4261 bytes .../themes/fdo/emblems/96/emblem-synchronizing.png | Bin 0 -> 6654 bytes .../themes/fdo/emblems/96/emblem-system.png | Bin 0 -> 6203 bytes .../themes/fdo/emblems/96/emblem-unreadable.png | Bin 0 -> 4645 bytes data/elementary/themes/fdo/index.theme | 15 ++++-- 25 files changed, 40 insertions(+), 35 deletions(-) diff --git a/data/elementary/themes/Makefile.am b/data/elementary/themes/Makefile.am index 0e9f254..13d6570 100644 --- a/data/elementary/themes/Makefile.am +++ b/data/elementary/themes/Makefile.am @@ -988,7 +988,7 @@ elementary/themes/snd/kbd-tap.wav \ \ elementary/themes/fdo/actions/scalable \ elementary/themes/fdo/categories/scalable \ -elementary/themes/fdo/emblems/scalable \ +elementary/themes/fdo/emblems/96 \ elementary/themes/fdo/places/16 \ elementary/themes/fdo/places/128 \ elementary/themes/fdo/status/scalable diff --git a/data/elementary/themes/edc/elm/icon_fdo.edc b/data/elementary/themes/edc/elm/icon_fdo.edc index f27bafe..c45ab35 100644 --- a/data/elementary/themes/edc/elm/icon_fdo.edc +++ b/data/elementary/themes/edc/elm/icon_fdo.edc @@ -23,16 +23,16 @@ */ -// Single FDO icon in 128px size -#define ICO1(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: 1.0 1.0; aspect_preference: BOTH; \ +// Single FDO icon +#define ICO1(Cat, Name, Size) \ + group { name: "elm/icon/"##Name##"/default"; \ + min: 16 16; \ + images.image: ##Cat##"/"##Size##"/"##Name##".png" COMP; \ + parts { \ + part { name: "base"; \ + desc { \ + image.normal: ##Cat##"/"##Size##"/"##Name##".png"; \ + aspect: 1.0 1.0; aspect_preference: BOTH; \ } } } } @@ -65,19 +65,19 @@ //// places ///////////////////////////////////////////////////////////////// #define CTX "places" -ICO1(CTX, "user-home") -ICO1(CTX, "user-bookmarks") -ICO1(CTX, "user-trash") +ICO1(CTX, "user-home", 128) +ICO1(CTX, "user-bookmarks", 128) +ICO1(CTX, "user-trash", 128) ICO2(CTX, "folder") ICO2(CTX, "folder-remote") ICO2(CTX, "folder-open") /* */ ICO2(CTX, "folder-home") /* */ ICO2(CTX, "folder-downloads") /* */ -ICO1(CTX, "folder-recent") /* */ -ICO1(CTX, "folder-documents") /* */ -ICO1(CTX, "folder-images") /* */ -ICO1(CTX, "folder-music") /* */ -ICO1(CTX, "folder-videos") /* */ +ICO1(CTX, "folder-recent", 128) /* */ +ICO1(CTX, "folder-documents", 128) /* */ +ICO1(CTX, "folder-images", 128) /* */ +ICO1(CTX, "folder-music", 128) /* */ +ICO1(CTX, "folder-videos", 128) /* */ ICO2(CTX, "network-server") ICO2(CTX, "network-workgroup") ICO2(CTX, "start-here") @@ -87,17 +87,17 @@ ICO2(CTX, "start-here") //// emblems //////////////////////////////////////////////////////////////// #define CTX "emblems" -// ICO1(CTX, "emblem-default") -// ICO1(CTX, "emblem-downloads") -// ICO1(CTX, "emblem-favorite") -// ICO1(CTX, "emblem-important") -// ICO1(CTX, "emblem-readonly") -// ICO1(CTX, "emblem-shared") -// ICO1(CTX, "emblem-symbolic-link") -// ICO1(CTX, "emblem-unreadable") -// ICO1(CTX, "emblem-system") -// ICO1(CTX, "emblem-synchronized") -// ICO1(CTX, "emblem-synchronizing") /* */ +ICO1(CTX, "emblem-default", 96) +ICO1(CTX, "emblem-downloads", 96) +ICO1(CTX, "emblem-favorite", 96) +ICO1(CTX, "emblem-important", 96) +ICO1(CTX, "emblem-readonly", 96) +ICO1(CTX, "emblem-shared", 96) +ICO1(CTX, "emblem-symbolic-link", 96) +ICO1(CTX, "emblem-unreadable", 96) +ICO1(CTX, "emblem-system", 96) +ICO1(CTX, "emblem-synchronized", 96) +ICO1(CTX, "emblem-synchronizing", 96) /* */ // TODO emblem-documents // TODO emblem-mail // TODO emblem-photos diff --git a/data/elementary/themes/fdo/emblems/scalable/emblem-default.svg b/data/elementary/themes/fdo/emblems/96-svg/emblem-default.svg similarity index 100% rename from data/elementary/themes/fdo/emblems/scalable/emblem-default.svg rename to data/elementary/themes/fdo/emblems/96-svg/emblem-default.svg diff --git a/data/elementary/themes/fdo/emblems/scalable/emblem-downloads.svg b/data/elementary/themes/fdo/emblems/96-svg/emblem-downloads.svg similarity index 100% rename from data/elementary/themes/fdo/emblems/scalable/emblem-downloads.svg rename to data/elementary/themes/fdo/emblems/96-svg/emblem-downloads.svg diff --git a/data/elementary/themes/fdo/emblems/scalable/emblem-favorite.svg b/data/elementary/themes/fdo/emblems/96-svg/emblem-favorite.svg similarity index 100% rename from data/elementary/themes/fdo/emblems/scalable/emblem-favorite.svg rename to data/elementary/themes/fdo/emblems/96-svg/emblem-favorite.svg diff --git a/data/elementary/themes/fdo/emblems/scalable/emblem-important.svg b/data/elementary/themes/fdo/emblems/96-svg/emblem-important.svg similarity index 100% rename from data/elementary/themes/fdo/emblems/scalable/emblem-important.svg rename to data/elementary/themes/fdo/emblems/96-svg/emblem-important.svg diff --git a/data/elementary/themes/fdo/emblems/scalable/emblem-readonly.svg b/data/elementary/themes/fdo/emblems/96-svg/emblem-readonly.svg similarity index 100% rename from data/elementary/themes/fdo/emblems/scalable/emblem-readonly.svg rename to data/elementary/themes/fdo/emblems/96-svg/emblem-readonly.svg diff --git a/data/elementary/themes/fdo/emblems/scalable/emblem-shared.svg b/data/elementary/themes/fdo/emblems/96-svg/emblem-shared.svg similarity index 100% rename from data/elementary/themes/fdo/emblems/scalable/emblem-shared.svg rename to data/elementary/themes/fdo/emblems/96-svg/emblem-shared.svg diff --git a/data/elementary/themes/fdo/emblems/scalable/emblem-symbolic-link.svg b/data/elementary/themes/fdo/emblems/96-svg/emblem-symbolic-link.svg similarity index 100% rename from data/elementary/themes/fdo/emblems/scalable/emblem-symbolic-link.svg rename to data/elementary/themes/fdo/emblems/96-svg/emblem-symbolic-link.svg diff --git a/data/elementary/themes/fdo/emblems/scalable/emblem-synchronized.svg b/data/elementary/themes/fdo/emblems/96-svg/emblem-synchronized.svg similarity index 100% rename from data/elementary/themes/fdo/emblems/scalable/emblem-synchronized.svg rename to data/elementary/themes/fdo/emblems/96-svg/emblem-synchronized.svg diff --git a/data/elementary/themes/fdo/emblems/scalable/emblem-synchronizing.svg b/data/elementary/themes/fdo/emblems/96-svg/emblem-synchronizing.svg similarity index 100% rename from data/elementary/themes/fdo/emblems/scalable/emblem-synchronizing.svg rename to data/elementary/themes/fdo/emblems/96-svg/emblem-synchronizing.svg diff --git a/data/elementary/themes/fdo/emblems/scalable/emblem-system.svg b/data/elementary/themes/fdo/emblems/96-svg/emblem-system.svg similarity index 100% rename from data/elementary/themes/fdo/emblems/scalable/emblem-system.svg rename to data/elementary/themes/fdo/emblems/96-svg/emblem-system.svg diff --git a/data/elementary/themes/fdo/emblems/scalable/emblem-unreadable.svg b/data/elementary/themes/fdo/emblems/96-svg/emblem-unreadable.svg similarity index 100% rename from data/elementary/themes/fdo/emblems/scalable/emblem-unreadable.svg rename to data/elementary/themes/fdo/emblems/96-svg/emblem-unreadable.svg diff --git a/data/elementary/themes/fdo/emblems/96/emblem-default.png b/data/elementary/themes/fdo/emblems/96/emblem-default.png new file mode 100644 index 0000000..2f2b31d Binary files /dev/null and b/data/elementary/themes/fdo/emblems/96/emblem-default.png differ diff --git a/data/elementary/themes/fdo/emblems/96/emblem-downloads.png b/data/elementary/themes/fdo/emblems/96/emblem-downloads.png new file mode 100644 index 0000000..6407b7a Binary files /dev/null and b/data/elementary/themes/fdo/emblems/96/emblem-downloads.png differ diff --git a/data/elementary/themes/fdo/emblems/96/emblem-favorite.png b/data/elementary/themes/fdo/emblems/96/emblem-favorite.png new file mode 100644 index 0000000..6a49e45 Binary files /dev/null and b/data/elementary/themes/fdo/emblems/96/emblem-favorite.png differ diff --git a/data/elementary/themes/fdo/emblems/96/emblem-important.png b/data/elementary/themes/fdo/emblems/96/emblem-important.png new file mode 100644 index 0000000..6e85e9d Binary files /dev/null and b/data/elementary/themes/fdo/emblems/96/emblem-important.png differ diff --git a/data/elementary/themes/fdo/emblems/96/emblem-readonly.png b/data/elementary/themes/fdo/emblems/96/emblem-readonly.png new file mode 100644 index 0000000..da9f479 Binary files /dev/null and b/data/elementary/themes/fdo/emblems/96/emblem-readonly.png differ diff --git a/data/elementary/themes/fdo/emblems/96/emblem-shared.png b/data/elementary/themes/fdo/emblems/96/emblem-shared.png new file mode 100644 index 0000000..bbdbbf0 Binary files /dev/null and b/data/elementary/themes/fdo/emblems/96/emblem-shared.png differ diff --git a/data/elementary/themes/fdo/emblems/96/emblem-symbolic-link.png b/data/elementary/themes/fdo/emblems/96/emblem-symbolic-link.png new file mode 100644 index 0000000..98815b0 Binary files /dev/null and b/data/elementary/themes/fdo/emblems/96/emblem-symbolic-link.png differ diff --git a/data/elementary/themes/fdo/emblems/96/emblem-synchronized.png b/data/elementary/themes/fdo/emblems/96/emblem-synchronized.png new file mode 100644 index 0000000..81cc076 Binary files /dev/null and b/data/elementary/themes/fdo/emblems/96/emblem-synchronized.png differ diff --git a/data/elementary/themes/fdo/emblems/96/emblem-synchronizing.png b/data/elementary/themes/fdo/emblems/96/emblem-synchronizing.png new file mode 100644 index 0000000..7e7d337 Binary files /dev/null and b/data/elementary/themes/fdo/emblems/96/emblem-synchronizing.png differ diff --git a/data/elementary/themes/fdo/emblems/96/emblem-system.png b/data/elementary/themes/fdo/emblems/96/emblem-system.png new file mode 100644 index 0000000..e7c4c3c Binary files /dev/null and b/data/elementary/themes/fdo/emblems/96/emblem-system.png differ diff --git a/data/elementary/themes/fdo/emblems/96/emblem-unreadable.png b/data/elementary/themes/fdo/emblems/96/emblem-unreadable.png new file mode 100644 index 0000000..a67822c Binary files /dev/null and b/data/elementary/themes/fdo/emblems/96/emblem-unreadable.png differ diff --git a/data/elementary/themes/fdo/index.theme b/data/elementary/themes/fdo/index.theme index 1eeae21..3dda183 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/scalable,status/scalable,places/128,places/16,emblems/scalable,categories/scalable +Directories=actions/scalable,status/scalable,places/128,places/16,emblems/96,categories/scalable Example=folder-home @@ -21,6 +21,15 @@ MinSize=16 MaxSize=22 +[emblems/96] +Size=96 +Context=Emblems +Type=Scalable +MinSize=8 +MaxSize=256 + + + [actions/scalable] Size=128 Context=Actions @@ -33,10 +42,6 @@ Context=Status Type=Scalable MinSize=16 -[emblems/scalable] -Size=96 -Context=Emblems -Type=Scalable [categories/scalable] Size=128 --